diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 3cba7719c852d0e1b44243e374b4b31b85b5256d..186628f5becf0fe4bba6fec51247d23001127d92 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 dec9090d1859b6210df556f6c7ce2597d5e88589..e2c87577f432c51219ba7c226c8a260b3df8ece7 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