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.
This commit is contained in:
parent
dbc04b4dc7
commit
15a2ef525f
@ -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"
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user