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

Fix universal builds on 32-bit CPUs.

Browse Source
This commit is contained in:
Adam Vandenberg 2010-04-22 11:15:03 -07:00
parent 54b5a7afbb
commit 7c158e2350
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,6 +179,9 @@ module HomebrewEnvExtension
append_to_cflags '-arch i386 -arch x86_64' append_to_cflags '-arch i386 -arch x86_64'
ENV.O3 if self['CFLAGS'].include? '-O4' # O4 seems to cause the build to fail ENV.O3 if self['CFLAGS'].include? '-O4' # O4 seems to cause the build to fail
ENV.append 'LDFLAGS', '-arch i386 -arch x86_64' ENV.append 'LDFLAGS', '-arch i386 -arch x86_64'
# Can't mix "-march" for a 32-bit CPU with "-arch x86_64"
remove_from_cflags(/-march=\S*/) if Hardware.is_32_bit?
end end
def prepend key, value, separator = ' ' def prepend key, value, separator = ' '

4
Library/Homebrew/hardware.rb
View File

@ -46,6 +46,10 @@ class Hardware
end end
end end
def self.is_32_bit?
not self.is_64_bit?
end
def self.is_64_bit? def self.is_64_bit?
self.sysctl_bool("hw.cpu64bit_capable") self.sysctl_bool("hw.cpu64bit_capable")
end end