From 390bcf413bd3bfa69b1663a37f71665b190da0eb Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sat, 17 Sep 2016 08:29:47 -0700 Subject: [PATCH] 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. --- Library/Homebrew/extend/os/mac/extend/ENV/shared.rb | 2 +- Library/Homebrew/extend/os/mac/extend/ENV/std.rb | 2 +- Library/Homebrew/extend/os/mac/extend/ENV/super.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb b/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb index ae1106167b..8662040243 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/shared.rb @@ -1,5 +1,5 @@ module SharedEnvExtension - def no_weak_import_support? + def no_weak_imports_support? return false unless compiler == :clang if MacOS::Xcode.version && MacOS::Xcode.version < "8.0" diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb index 7b8b4213df..8efbd3bc94 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb @@ -143,6 +143,6 @@ module Stdenv end def no_weak_imports - append "LDFLAGS", "-Wl,-no_weak_imports" + append "LDFLAGS", "-Wl,-no_weak_imports" if no_weak_imports_support? end end diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb index 84b6622992..78e36251cf 100644 --- a/Library/Homebrew/extend/os/mac/extend/ENV/super.rb +++ b/Library/Homebrew/extend/os/mac/extend/ENV/super.rb @@ -113,7 +113,7 @@ module Superenv end def no_weak_imports - append "HOMEBREW_CCCFG", "w" + append "HOMEBREW_CCCFG", "w" if no_weak_imports_support? end # These methods are no longer necessary under superenv, but are needed to