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

Only interpolate constant regexps once

Browse Source
This commit is contained in:
Jack Nagel 2014-04-21 10:35:05 -05:00
parent eed3368039
commit 9d15aefd2e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/ENV/4.3/cc
View File

@ -171,7 +171,7 @@ class Cmd
def keep? path def keep? path
case path case path
when %r{^#{Regexp.escape(brewfix)}}, %r{^#{Regexp.escape(brewtmp)}} when %r{^#{Regexp.escape(brewfix)}}o, %r{^#{Regexp.escape(brewtmp)}}o
# maybe homebrew is installed to /sw or /opt/brew # maybe homebrew is installed to /sw or /opt/brew
true true
when %r{^/opt}, %r{^/sw}, %r{/usr/X11} when %r{^/opt}, %r{^/sw}, %r{/usr/X11}
@ -233,7 +233,7 @@ class Cmd
def cpath def cpath
cpath = path_split("CMAKE_PREFIX_PATH").map! { |d| File.join(d, "include") } cpath = path_split("CMAKE_PREFIX_PATH").map! { |d| File.join(d, "include") }
cpath += path_split("CMAKE_INCLUDE_PATH") cpath += path_split("CMAKE_INCLUDE_PATH")
opt = cpath.grep(%r{^#{Regexp.escape(brewfix)}/opt}) opt = cpath.grep(%r{^#{Regexp.escape(brewfix)}/opt}o)
sys = cpath - opt sys = cpath - opt
[sys, opt] [sys, opt]
end end