diff options
| author | Jack Nagel | 2013-06-13 18:41:14 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-06-14 10:34:19 -0500 |
| commit | 723f7ed11194e9fc5ef2831548b4a6a1389ef89d (patch) | |
| tree | 9ed949496555b47b6f064fcdfe0e520f3c7e7388 /Library | |
| parent | 4e4a5af731b9a17f401d13d9dcd9e33ee99da186 (diff) | |
| download | brew-723f7ed11194e9fc5ef2831548b4a6a1389ef89d.tar.bz2 | |
Simplify nested conditional
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index f69467bae..591c0485e 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -298,9 +298,9 @@ module HomebrewEnvExtension replace_in_cflags '-O4', '-O3' # O4 seems to cause the build to fail append 'LDFLAGS', '-arch i386 -arch x86_64' - unless compiler == :clang + if compiler != :clang && Hardware.is_32_bit? # Can't mix "-march" for a 32-bit CPU with "-arch x86_64" - replace_in_cflags(/-march=\S*/, '-Xarch_i386 \0') if Hardware::CPU.is_32_bit? + replace_in_cflags(/-march=\S*/, '-Xarch_i386 \0') end end |