admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Unset CLICOLOR_FORCE in the build environment

Browse Source 
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>
This commit is contained in:
Jack Nagel 2012-02-16 16:55:28 -06:00
parent e7466c5b33
commit 59bd97bb89
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/cmd/doctor.rb
View File

@ -687,16 +687,6 @@ def check_for_MACOSX_DEPLOYMENT_TARGET
end end
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 def check_for_other_frameworks
# Other frameworks that are known to cause problems when present # Other frameworks that are known to cause problems when present
["/Library/Frameworks/expat.framework", "/Library/Frameworks/libexpat.framework"].each do |f| ["/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_config_scripts
check_for_dyld_vars check_for_dyld_vars
check_for_MACOSX_DEPLOYMENT_TARGET check_for_MACOSX_DEPLOYMENT_TARGET
check_for_CLICOLOR_FORCE
check_for_symlinked_cellar check_for_symlinked_cellar
check_for_multiple_volumes check_for_multiple_volumes
check_for_git check_for_git

1
Library/Homebrew/extend/ENV.rb
View File

@ -8,6 +8,7 @@ module HomebrewEnvExtension
delete('CPPFLAGS') delete('CPPFLAGS')
delete('LDFLAGS') delete('LDFLAGS')
delete('GREP_OPTIONS') # can break CMake (lol) delete('GREP_OPTIONS') # can break CMake (lol)
delete('CLICOLOR_FORCE') # autotools doesn't like this
self['MAKEFLAGS'] = "-j#{self.make_jobs}" self['MAKEFLAGS'] = "-j#{self.make_jobs}"