Revert "Revert "cc: always filter flags on deps.""

This commit is contained in:
Mike McQuaid 2017-02-27 13:41:30 +00:00 committed by GitHub
parent 0dfe85df13
commit 86a9434dfc

View File

@ -206,10 +206,6 @@ class Cmd
end
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
if formula_prefix && path.start_with?("#{formula_prefix}/")
true
@ -226,11 +222,6 @@ class Cmd
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
args = []