Merge pull request #2211 from Homebrew/revert-1796-revert-1746-always-filter-flags-deps

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

1 files changed, 0 insertions, 9 deletions

diff --git a/Library/Homebrew/shims/super/cc b/Library/Homebrew/shims/super/cc
index b0ea705e8..1400788ba 100755
--- a/Library/Homebrew/shims/super/cc
+++ b/Library/Homebrew/shims/super/cc
@@ -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 = []