no_weak_imports: always check for support

ENV.no_weak_imports should be a no-op when Xcode doesn't support the
feature to avoid breaking builds with <= Xcode 7.
This commit is contained in:
ilovezfs 2016-09-17 08:29:47 -07:00
parent 299dffd903
commit 390bcf413b
3 changed files with 3 additions and 3 deletions

View File

@ -1,5 +1,5 @@
module SharedEnvExtension module SharedEnvExtension
def no_weak_import_support? def no_weak_imports_support?
return false unless compiler == :clang return false unless compiler == :clang
if MacOS::Xcode.version && MacOS::Xcode.version < "8.0" if MacOS::Xcode.version && MacOS::Xcode.version < "8.0"

View File

@ -143,6 +143,6 @@ module Stdenv
end end
def no_weak_imports def no_weak_imports
append "LDFLAGS", "-Wl,-no_weak_imports" append "LDFLAGS", "-Wl,-no_weak_imports" if no_weak_imports_support?
end end
end end

View File

@ -113,7 +113,7 @@ module Superenv
end end
def no_weak_imports def no_weak_imports
append "HOMEBREW_CCCFG", "w" append "HOMEBREW_CCCFG", "w" if no_weak_imports_support?
end end
# These methods are no longer necessary under superenv, but are needed to # These methods are no longer necessary under superenv, but are needed to