diff options
| author | Jack Nagel | 2014-05-10 16:54:30 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-05-10 16:54:30 -0500 |
| commit | 28c69faa2e17ceca8106d0bf3d7561bb2bb3b891 (patch) | |
| tree | feba59cb5442212979eac169c0e2d557f04b128f /Library | |
| parent | 346de91838b50401455e2473deb9ea110e5862c4 (diff) | |
| download | homebrew-28c69faa2e17ceca8106d0bf3d7561bb2bb3b891.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-x | Library/ENV/4.3/cc | 8 |
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', |