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.
This commit is contained in:
Misty De Meo 2016-04-05 12:06:03 -07:00
parent 1f8b6cb576
commit ef4cad0c77

View File

@ -213,13 +213,13 @@ class Cmd
elsif path.start_with?(prefix) elsif path.start_with?(prefix)
true true
else else
!path.start_with?("/opt", "/sw", "/usr/X11") !path.start_with?("/opt/local", "/opt/boxen/homebrew", "/opt/X11", "/sw", "/usr/X11")
end end
end end
# The original less-smart version of keep_orig; will eventually be removed # The original less-smart version of keep_orig; will eventually be removed
def keep_orig?(path) 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 end
def cflags def cflags