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

Tweak SDK variables for new Xcode/CLT setup.

Browse Source
This commit is contained in:
Mike McQuaid 2017-11-17 19:58:11 +00:00
parent cd0db51343
commit 2e1331cbc8
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/extend/os/mac/extend/ENV/super.rb
View File

@ -9,7 +9,7 @@ module Superenv
end end
def effective_sysroot def effective_sysroot
MacOS::Xcode.without_clt? ? MacOS.sdk_path.to_s : nil MacOS.sdk_path.to_s if MacOS::Xcode.without_clt?
end end
def homebrew_extra_paths def homebrew_extra_paths
@ -91,10 +91,8 @@ module Superenv
generic_setup_build_environment(formula) generic_setup_build_environment(formula)
self["HOMEBREW_SDKROOT"] = effective_sysroot self["HOMEBREW_SDKROOT"] = effective_sysroot
if MacOS::Xcode.without_clt? || MacOS::Xcode.version.to_i >= 7
self["MACOSX_DEPLOYMENT_TARGET"] = MacOS.version.to_s self["MACOSX_DEPLOYMENT_TARGET"] = MacOS.version.to_s
self["SDKROOT"] = MacOS.sdk_path self["SDKROOT"] = MacOS.sdk_path if MacOS::Xcode.without_clt?
end
# Filter out symbols known not to be defined since GNU Autotools can't # Filter out symbols known not to be defined since GNU Autotools can't
# reliably figure this out with Xcode 8 and above. # reliably figure this out with Xcode 8 and above.