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

Preserve -Xarch_<arch> context when filtering args

Browse Source
This commit is contained in:
Jack Nagel 2014-05-06 15:21:01 -05:00
parent fb296f8224
commit 0418865d56
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/ENV/4.3/cc
View File

@ -125,7 +125,18 @@ class Cmd
enum = @args.each enum = @args.each
loop do loop do
args += refurbish_arg(enum.next, enum) case arg = enum.next
when "-arch"
enum.next
when /^-Xarch_/
refurbished = refurbish_arg(enum.next, enum)
unless refurbished.empty?
args << arg
args += refurbished
end
else
args += refurbish_arg(arg, enum)
end
end end
args args
@ -135,8 +146,6 @@ class Cmd
args = [] args = []
case arg case arg
when '-arch', /^-Xarch_/
enum.next
when '-m32' when '-m32'
# If ENV.m32 was set, we allow the "-m32" flag, but we don't add anything # If ENV.m32 was set, we allow the "-m32" flag, but we don't add anything
args << '-m32' if cccfg? '3' args << '-m32' if cccfg? '3'