From e4630164284de3ea5347b2338000795773756d86 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 16 Mar 2013 13:50:44 -0500 Subject: [PATCH] ENV: clear influential include path vars --- Library/Homebrew/extend/ENV.rb | 1 + Library/Homebrew/superenv.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 3cba7719c8..186628f5be 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 dec9090d18..e2c87577f4 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