admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #7335 from Bo98/std-isysroot

Browse Source 
ENV/std: remove space in -isysroot
This commit is contained in:
Mike McQuaid 2020-04-13 09:05:00 +01:00 committed by GitHub
commit 9b8762f5c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/extend/os/mac/extend/ENV/std.rb
View File

@ -60,9 +60,9 @@ module Stdenv
return unless (sdk = MacOS.sdk_path_if_needed(version)) return unless (sdk = MacOS.sdk_path_if_needed(version))
delete("SDKROOT") delete("SDKROOT")
remove_from_cflags "-isysroot #{sdk}" remove_from_cflags "-isysroot#{sdk}"
remove "CPPFLAGS", "-isysroot #{sdk}" remove "CPPFLAGS", "-isysroot#{sdk}"
remove "LDFLAGS", "-isysroot #{sdk}" remove "LDFLAGS", "-isysroot#{sdk}"
if HOMEBREW_PREFIX.to_s == "/usr/local" if HOMEBREW_PREFIX.to_s == "/usr/local"
delete("CMAKE_PREFIX_PATH") delete("CMAKE_PREFIX_PATH")
else else
@ -87,10 +87,10 @@ module Stdenv
# Tell clang/gcc where system include's are: # Tell clang/gcc where system include's are:
append_path "CPATH", "#{sdk}/usr/include" append_path "CPATH", "#{sdk}/usr/include"
# The -isysroot is needed, too, because of the Frameworks # The -isysroot is needed, too, because of the Frameworks
append_to_cflags "-isysroot #{sdk}" append_to_cflags "-isysroot#{sdk}"
append "CPPFLAGS", "-isysroot #{sdk}" append "CPPFLAGS", "-isysroot#{sdk}"
# And the linker needs to find sdk/usr/lib # And the linker needs to find sdk/usr/lib
append "LDFLAGS", "-isysroot #{sdk}" append "LDFLAGS", "-isysroot#{sdk}"
# Needed to build cmake itself and perhaps some cmake projects: # Needed to build cmake itself and perhaps some cmake projects:
append_path "CMAKE_PREFIX_PATH", "#{sdk}/usr" append_path "CMAKE_PREFIX_PATH", "#{sdk}/usr"
append_path "CMAKE_FRAMEWORK_PATH", "#{sdk}/System/Library/Frameworks" append_path "CMAKE_FRAMEWORK_PATH", "#{sdk}/System/Library/Frameworks"