aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorJack Nagel2013-03-16 13:50:44 -0500
committerJack Nagel2013-03-16 13:51:30 -0500
commit832288e2fce17aa4d9bf5276c9c289326dc6173c (patch)
treec947f9014f522762f9b5a4bfe83590c7d0402e25 /Library/Homebrew
parent019364d3328c76062b542069d5f753d8315362ca (diff)
downloadhomebrew-832288e2fce17aa4d9bf5276c9c289326dc6173c.tar.bz2
ENV: clear influential include path vars
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/extend/ENV.rb1
-rw-r--r--Library/Homebrew/superenv.rb3
2 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index 3cba7719c..186628f5b 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -7,6 +7,7 @@ module HomebrewEnvExtension
delete('CDPATH')
delete('GREP_OPTIONS') # can break CMake (lol)
delete('CLICOLOR_FORCE') # autotools doesn't like this
+ %w{CPATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH OBJC_INCLUDE_PATH}.each { |k| delete(k) }
remove_cc_etc
if MacOS.version >= :mountain_lion
diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
index dec9090d1..e2c87577f 100644
--- a/Library/Homebrew/superenv.rb
+++ b/Library/Homebrew/superenv.rb
@@ -29,7 +29,8 @@ class << ENV
%w{CC CXX OBJC OBJCXX CPP MAKE LD
CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS LDFLAGS CPPFLAGS
MACOS_DEPLOYMENT_TARGET SDKROOT
- CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_FRAMEWORK_PATH}.
+ CMAKE_PREFIX_PATH CMAKE_INCLUDE_PATH CMAKE_FRAMEWORK_PATH
+ CPATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH OBJC_INCLUDE_PATH}.
each{ |x| delete(x) }
delete('CDPATH') # avoid make issues that depend on changing directories
delete('GREP_OPTIONS') # can break CMake