From ef4cad0c774129af7279090e9689683758a659a2 Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Tue, 5 Apr 2016 12:06:03 -0700 Subject: 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. --- Library/ENV/4.3/cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Library') 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 -- cgit v1.2.3