diff options
| author | Mike McQuaid | 2017-11-17 19:58:11 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2017-11-17 21:35:49 +0000 |
| commit | 2e1331cbc8917353411dde26b45ed1df444cfb99 (patch) | |
| tree | 12b6e36a3a49f2854eca5f6502334864f8de9b07 /Library/Homebrew | |
| parent | cd0db51343ff7c5a35173594725978c81c36c0fc (diff) | |
| download | brew-2e1331cbc8917353411dde26b45ed1df444cfb99.tar.bz2 | |
Tweak SDK variables for new Xcode/CLT setup.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/extend/os/mac/extend/ENV/super.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb index ee0d2343c..287e838ea 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb @@ -9,7 +9,7 @@ module Superenv end def effective_sysroot - MacOS::Xcode.without_clt? ? MacOS.sdk_path.to_s : nil + MacOS.sdk_path.to_s if MacOS::Xcode.without_clt? end def homebrew_extra_paths @@ -91,10 +91,8 @@ module Superenv generic_setup_build_environment(formula) 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["SDKROOT"] = MacOS.sdk_path - end + self["MACOSX_DEPLOYMENT_TARGET"] = MacOS.version.to_s + self["SDKROOT"] = MacOS.sdk_path if MacOS::Xcode.without_clt? # Filter out symbols known not to be defined since GNU Autotools can't # reliably figure this out with Xcode 8 and above. |