aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2013-03-16 13:50:44 -0500
committerJack Nagel2013-03-16 13:51:30 -0500
commite4630164284de3ea5347b2338000795773756d86 (patch)
tree5f5a87eda6c2ae708b716563ef09892fc9a52fb5 /Library
parenta55fa2c359f7e05ebabbf24b1d75fe206f88ac9c (diff)
downloadbrew-e4630164284de3ea5347b2338000795773756d86.tar.bz2
ENV: clear influential include path vars
Diffstat (limited to 'Library')
-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