Merge pull request #3464 from ilovezfs/ENV-no-MACOSX_DEPLOYMENT_TARGET

ENV: don't set MACOSX_DEPLOYMENT_TARGET
This commit is contained in:
ilovezfs 2017-11-20 09:59:47 -08:00 committed by GitHub
commit c458c90236
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 4 deletions

View File

@ -60,7 +60,6 @@ module Stdenv
# previously added by macosxsdk # previously added by macosxsdk
version = version.to_s version = version.to_s
remove_from_cflags(/ ?-mmacosx-version-min=10\.\d+/) remove_from_cflags(/ ?-mmacosx-version-min=10\.\d+/)
delete("MACOSX_DEPLOYMENT_TARGET")
delete("CPATH") delete("CPATH")
remove "LDFLAGS", "-L#{HOMEBREW_PREFIX}/lib" remove "LDFLAGS", "-L#{HOMEBREW_PREFIX}/lib"
@ -83,7 +82,6 @@ module Stdenv
remove_macosxsdk remove_macosxsdk
version = version.to_s version = version.to_s
append_to_cflags("-mmacosx-version-min=#{version}") append_to_cflags("-mmacosx-version-min=#{version}")
self["MACOSX_DEPLOYMENT_TARGET"] = version
self["CPATH"] = "#{HOMEBREW_PREFIX}/include" self["CPATH"] = "#{HOMEBREW_PREFIX}/include"
prepend "LDFLAGS", "-L#{HOMEBREW_PREFIX}/lib" prepend "LDFLAGS", "-L#{HOMEBREW_PREFIX}/lib"

View File

@ -90,8 +90,6 @@ module Superenv
def setup_build_environment(formula = nil) def setup_build_environment(formula = nil)
generic_setup_build_environment(formula) generic_setup_build_environment(formula)
self["HOMEBREW_SDKROOT"] = effective_sysroot self["HOMEBREW_SDKROOT"] = effective_sysroot
self["MACOSX_DEPLOYMENT_TARGET"] = MacOS.version.to_s
self["SDKROOT"] = MacOS.sdk_path if MacOS::Xcode.without_clt? self["SDKROOT"] = MacOS.sdk_path if MacOS::Xcode.without_clt?
# 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