Fix universal builds on 32-bit CPUs.

2 files changed, 7 insertions, 0 deletions

diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index 0e37b9f17..c0b6318a2 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -179,6 +179,9 @@ module HomebrewEnvExtension
     append_to_cflags '-arch i386 -arch x86_64'
     ENV.O3 if self['CFLAGS'].include? '-O4' # O4 seems to cause the build to fail
     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
 
   def prepend key, value, separator = ' '
diff --git a/Library/Homebrew/hardware.rb b/Library/Homebrew/hardware.rb
index 549e02543..b10b2770c 100644
--- a/Library/Homebrew/hardware.rb
+++ b/Library/Homebrew/hardware.rb
@@ -46,6 +46,10 @@ class Hardware
     end
   end
 
+  def self.is_32_bit?
+    not self.is_64_bit?
+  end
+
   def self.is_64_bit?
     self.sysctl_bool("hw.cpu64bit_capable")
   end