aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-05-10 16:54:30 -0500
committerJack Nagel2014-05-10 16:54:30 -0500
commitdf3e6bade5123a196e3f687ef00d46ae74845e67 (patch)
tree5ada04fe79e9e1a922e470a0c49a90f2fd182889 /Library
parent5f94742afb32ec1c8d3ceb2db69f5ea0d3545f5c (diff)
downloadbrew-df3e6bade5123a196e3f687ef00d46ae74845e67.tar.bz2
Move -m32 and -m64 filtering up one level
These flags cannot be used behind -Xarch_<arch>, so stop filtering them there.
Diffstat (limited to 'Library')
-rwxr-xr-xLibrary/ENV/4.3/cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc
index d66b6dc83..d2c581d34 100755
--- a/Library/ENV/4.3/cc
+++ b/Library/ENV/4.3/cc
@@ -128,6 +128,9 @@ class Cmd
case arg = enum.next
when "-arch"
enum.next
+ when "-m32"
+ args << arg if cccfg?("3")
+ when "-m64"
when /^-Xarch_/
refurbished = refurbish_arg(enum.next, enum)
unless refurbished.empty?
@@ -146,11 +149,8 @@ class Cmd
args = []
case arg
- when '-m32'
- # If ENV.m32 was set, we allow the "-m32" flag, but we don't add anything
- args << '-m32' if cccfg? '3'
when /^-g\d?/, /^-gstabs\d+/, '-gstabs+', /^-ggdb\d?/, '-gdwarf-2',
- /^-march=.+/, /^-mtune=.+/, /^-mcpu=.+/, '-m64',
+ /^-march=.+/, /^-mtune=.+/, /^-mcpu=.+/,
/^-O[0-9zs]?$/, '-fast', '-no-cpp-precomp',
'-pedantic', '-pedantic-errors'
when '-fopenmp', '-lgomp', '-mno-fused-madd', '-fforce-addr', '-fno-defer-pop',