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

Apply the same filtering to -I paths as -L paths

Browse Source
This commit is contained in:
Jack Nagel 2013-12-27 15:46:36 -06:00
parent b745d21912
commit 2e22465aa4
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/ENV/4.3/cc
View File

@ -134,10 +134,19 @@ class Cmd
when /^-I(.+)?/ when /^-I(.+)?/
# Support both "-Ifoo" (one argument) and "-I foo" (two arguments) # Support both "-Ifoo" (one argument) and "-I foo" (two arguments)
path = $1.chuzzle || whittler.next path = $1.chuzzle || whittler.next
args << "-I#{path}" if iset.add?(path.cleanpath) args << "-I#{path}" if keep?(path) and iset.add?(path.cleanpath)
when /^-L(.+)?/ when /^-L(.+)?/
path = $1.chuzzle || whittler.next path = $1.chuzzle || whittler.next
doit = case path.cleanpath args << "-L#{path}" if keep?(path) and lset.add?(path.cleanpath)
else
args << arg
end
end
args
end
def keep? path
case path.cleanpath
when %r{^#{Regexp.escape(brewfix)}}, %r{^#{Regexp.escape(brewtmp)}} when %r{^#{Regexp.escape(brewfix)}}, %r{^#{Regexp.escape(brewtmp)}}
# maybe homebrew is installed to /sw or /opt/brew # maybe homebrew is installed to /sw or /opt/brew
true true
@ -146,13 +155,8 @@ class Cmd
else else
true true
end end
args << "-L#{path}" if doit and lset.add?(path.cleanpath)
else
args << arg
end
end
args
end end
def cflags def cflags
args = [] args = []