diff options
| author | ilovezfs | 2017-11-18 11:31:08 -0800 |
|---|---|---|
| committer | ilovezfs | 2017-11-18 11:31:08 -0800 |
| commit | 15a2ef525f3d668c16efccb1d3a477cf90a1d0e0 (patch) | |
| tree | 7202be275d412076cebd5660960bbbf1bea2f489 | |
| parent | dbc04b4dc701aa1d0aa9197dd12be92c7b1800fc (diff) | |
| download | brew-15a2ef525f3d668c16efccb1d3a477cf90a1d0e0.tar.bz2 | |
ENV: don't set MACOSX_DEPLOYMENT_TARGET
CMake tries to use Xcode if MACOSX_DEPLOYMENT_TARGET is set but that can
lead to build failures when SDKROOT isn't set. The CMake behavior at
minimum manifests as -isysroot spontaneously being set to the Xcode SDK,
which brew sometimes can't successfully fully unwind with its ENV hacks.
| -rw-r--r-- | Library/Homebrew/extend/os/mac/extend/ENV/std.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/extend/os/mac/extend/ENV/super.rb | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb index dd273cfbc..1a6d10f3b 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb @@ -60,7 +60,6 @@ module Stdenv # previously added by macosxsdk version = version.to_s remove_from_cflags(/ ?-mmacosx-version-min=10\.\d+/) - delete("MACOSX_DEPLOYMENT_TARGET") delete("CPATH") remove "LDFLAGS", "-L#{HOMEBREW_PREFIX}/lib" @@ -83,7 +82,6 @@ module Stdenv remove_macosxsdk version = version.to_s append_to_cflags("-mmacosx-version-min=#{version}") - self["MACOSX_DEPLOYMENT_TARGET"] = version self["CPATH"] = "#{HOMEBREW_PREFIX}/include" prepend "LDFLAGS", "-L#{HOMEBREW_PREFIX}/lib" diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb index 287e838ea..f233002ea 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb @@ -90,8 +90,6 @@ module Superenv def setup_build_environment(formula = nil) generic_setup_build_environment(formula) self["HOMEBREW_SDKROOT"] = effective_sysroot - - 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 |