admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Simplify nested conditional

Browse Source
This commit is contained in:
Jack Nagel 2013-06-13 18:41:14 -05:00
parent 4e4a5af731
commit 723f7ed111
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/extend/ENV.rb
View File

@ -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