diff options
| author | Jack Nagel | 2012-02-16 16:55:28 -0600 |
|---|---|---|
| committer | Jack Nagel | 2012-02-16 16:55:28 -0600 |
| commit | 59bd97bb893fd12e99d446aaa8abceb73c5b7afa (patch) | |
| tree | 9dad898cba171059bf147c82f90838917526724f | |
| parent | e7466c5b3354c5e389e29a56ec07f3dcbc51fd73 (diff) | |
| download | brew-59bd97bb893fd12e99d446aaa8abceb73c5b7afa.tar.bz2 | |
Unset CLICOLOR_FORCE in the build environment
If we're going to unset GREP_OPTIONS we may as well unset this one too,
as it causes similar issues. Recent autoconf unset both of these.
Fixes Homebrew/homebrew#8165.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
| -rw-r--r-- | Library/Homebrew/cmd/doctor.rb | 11 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index 5465a442f..b81a2f1a9 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -687,16 +687,6 @@ def check_for_MACOSX_DEPLOYMENT_TARGET end end -def check_for_CLICOLOR_FORCE - if ENV['CLICOLOR_FORCE'] - puts <<-EOS.undent - Having CLICOLOR_FORCE set can cause some builds to fail. - You may want to unset it. - - EOS - end -end - def check_for_other_frameworks # Other frameworks that are known to cause problems when present ["/Library/Frameworks/expat.framework", "/Library/Frameworks/libexpat.framework"].each do |f| @@ -851,7 +841,6 @@ module Homebrew extend self check_for_config_scripts check_for_dyld_vars check_for_MACOSX_DEPLOYMENT_TARGET - check_for_CLICOLOR_FORCE check_for_symlinked_cellar check_for_multiple_volumes check_for_git diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index f77d0007e..c41b79f12 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -8,6 +8,7 @@ module HomebrewEnvExtension delete('CPPFLAGS') delete('LDFLAGS') delete('GREP_OPTIONS') # can break CMake (lol) + delete('CLICOLOR_FORCE') # autotools doesn't like this self['MAKEFLAGS'] = "-j#{self.make_jobs}" |