aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisty De Meo2016-04-05 12:06:03 -0700
committerMisty De Meo2016-04-06 16:16:14 -0700
commitef4cad0c774129af7279090e9689683758a659a2 (patch)
tree115de96002b6d6cd2c316b277042aff2fe34eb83
parent1f8b6cb57677d96228627baf28ce18a394df4c1d (diff)
downloadbrew-ef4cad0c774129af7279090e9689683758a659a2.tar.bz2
superenv: don't filter out all /opt paths
This was intended to filter out MacPorts and X11 paths, but the user may have valid reasons to have other things here that might get linked against.
-rwxr-xr-xLibrary/ENV/4.3/cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/ENV/4.3/cc b/Library/ENV/4.3/cc
index 2edf2df80..1bef04ab0 100755
--- a/Library/ENV/4.3/cc
+++ b/Library/ENV/4.3/cc
@@ -213,13 +213,13 @@ class Cmd
elsif path.start_with?(prefix)
true
else
- !path.start_with?("/opt", "/sw", "/usr/X11")
+ !path.start_with?("/opt/local", "/opt/boxen/homebrew", "/opt/X11", "/sw", "/usr/X11")
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", "/sw", "/usr/X11")
+ path.start_with?(prefix, cellar, tmpdir) || !path.start_with?("/opt/local", "/opt/boxen/homebrew", "/opt/X11", "/sw", "/usr/X11")
end
def cflags