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

Move -m32 and -m64 filtering up one level

Browse Source 
These flags cannot be used behind -Xarch_<arch>, so stop filtering them
there.
This commit is contained in:
Jack Nagel 2014-05-10 16:54:30 -05:00
parent 5f94742afb
commit df3e6bade5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/ENV/4.3/cc
View File

@ -128,6 +128,9 @@ class Cmd
case arg = enum.next case arg = enum.next
when "-arch" when "-arch"
enum.next enum.next
when "-m32"
args << arg if cccfg?("3")
when "-m64"
when /^-Xarch_/ when /^-Xarch_/
refurbished = refurbish_arg(enum.next, enum) refurbished = refurbish_arg(enum.next, enum)
unless refurbished.empty? unless refurbished.empty?
@ -146,11 +149,8 @@ class Cmd
args = [] args = []
case arg 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', when /^-g\d?/, /^-gstabs\d+/, '-gstabs+', /^-ggdb\d?/, '-gdwarf-2',
/^-march=.+/, /^-mtune=.+/, /^-mcpu=.+/, '-m64', /^-march=.+/, /^-mtune=.+/, /^-mcpu=.+/,
/^-O[0-9zs]?$/, '-fast', '-no-cpp-precomp', /^-O[0-9zs]?$/, '-fast', '-no-cpp-precomp',
'-pedantic', '-pedantic-errors' '-pedantic', '-pedantic-errors'
when '-fopenmp', '-lgomp', '-mno-fused-madd', '-fforce-addr', '-fno-defer-pop', when '-fopenmp', '-lgomp', '-mno-fused-madd', '-fforce-addr', '-fno-defer-pop',