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

ENV.universal_binary: use as_arch_flags

Browse Source
This commit is contained in:
Misty De Meo 2013-08-15 23:04:26 -07:00
parent e6d5e813d4
commit 1333b8d666
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

@ -292,9 +292,9 @@ module HomebrewEnvExtension
end
def universal_binary
append_to_cflags "-arch #{Hardware::CPU.arch_32_bit} -arch #{Hardware::CPU.arch_64_bit}"
append_to_cflags Hardware::CPU.universal_archs.as_arch_flags
replace_in_cflags '-O4', '-O3' # O4 seems to cause the build to fail
append 'LDFLAGS', "-arch #{Hardware::CPU.arch_32_bit} -arch #{Hardware::CPU.arch_64_bit}"
append 'LDFLAGS', Hardware::CPU.universal_archs.as_arch_flags
if compiler != :clang && Hardware.is_32_bit?
# Can't mix "-march" for a 32-bit CPU with "-arch x86_64"