Merge pull request #6749 from Bo98/cpp-fix

shims/super/cc: remove isysroot space to fix cpp
This commit is contained in:
Mike McQuaid 2019-11-20 12:51:17 +00:00 committed by GitHub
commit a123d90e5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -114,7 +114,7 @@ class Cmd
if tool == "ld"
args << "-syslibroot" << sysroot
else
args << "-isysroot" << sysroot << "--sysroot=#{sysroot}"
args << "-isysroot#{sysroot}" << "--sysroot=#{sysroot}"
end
end
@ -213,7 +213,7 @@ class Cmd
if mac?
sdk = enum.next
# We set the sysroot for macOS SDKs
args << "-isysroot" << sdk unless sdk.downcase.include? "osx"
args << "-isysroot#{sdk}" unless sdk.downcase.include? "osx"
else
args << arg << enum.next
end