Fix ENV.m32 under superenv

2 files changed, 5 insertions, 9 deletions

diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc
index f7ffe87ec..06a504da1 100755
--- a/Library/ENV/4.3/cc
+++ b/Library/ENV/4.3/cc
@@ -132,9 +132,7 @@ class Cmd
         else
           enum.next
         end
-      when "-m32"
-        args << arg if cccfg?("3") || cccfg?("K")
-      when "-m64"
+      when "-m32", "-m64"
         args << arg if cccfg?("K")
       when /^-Xarch_/
         refurbished = refurbish_arg(enum.next, enum)
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index 18073db46..011b854ab 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -84,7 +84,6 @@ module Superenv
     # compiler flag stripping. It consists of a string of characters which act
     # as flags. Some of these flags are mutually exclusive.
     #
-    # 3 - A 32-bit build was requested
     # O - Enables argument refurbishing. Only active under the
     #     make/bsdmake wrappers currently.
     # x - Enable C++11 mode.
@@ -297,6 +296,10 @@ module Superenv
     append "HOMEBREW_CCCFG", "K"
   end
 
+  def m32
+    append "HOMEBREW_ARCHFLAGS", "-m32"
+  end
+
   def cxx11
     case homebrew_cc
     when "clang"
@@ -321,11 +324,6 @@ module Superenv
     append 'HOMEBREW_CCCFG', "O", ''
   end
 
-  # m32 on superenv does not add any CC flags. It prevents "-m32" from being erased.
-  def m32
-    append 'HOMEBREW_CCCFG', "3", ''
-  end
-
   %w{O3 O2 O1 O0 Os}.each do |opt|
     define_method opt do
       self['HOMEBREW_OPTIMIZATION_LEVEL'] = opt