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

Revert "cc: always filter flags on deps."

Browse Source
This commit is contained in:
Mike McQuaid 2017-01-07 09:52:01 +00:00 committed by GitHub
parent 1c710adb44
commit f814ee87fb
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/shims/super/cc
View File

@ -206,6 +206,10 @@ class Cmd
end end
def keep?(path) def keep?(path)
# The logic in this method will eventually become the default,
# but is currently opt-in.
return keep_orig?(path) unless ENV["HOMEBREW_EXPERIMENTAL_FILTER_FLAGS_ON_DEPS"]
# Allow references to self # Allow references to self
if formula_prefix && path.start_with?("#{formula_prefix}/") if formula_prefix && path.start_with?("#{formula_prefix}/")
true true
@ -222,6 +226,11 @@ class Cmd
end end
end end
# The original less-smart version of keep_orig; will eventually be removed
def keep_orig?(path)
path.start_with?(prefix, cellar, tmpdir) || !path.start_with?("/opt/local", "/opt/boxen/homebrew", "/opt/X11", "/sw", "/usr/X11")
end
def cflags def cflags
args = [] args = []