cc: always filter flags on deps.

This has been tested by `brew test-bot` since March and there’s been no
issues so let’s turn it on by default.
This commit is contained in:
Mike McQuaid 2016-12-30 14:31:05 +00:00
parent 4ca2eaf8df
commit e4497a2b42

View File

@ -206,10 +206,6 @@ 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
@ -226,11 +222,6 @@ 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 = []