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

Delete ENV[GREP_OPTIONS] and the related doctor check

Browse Source 
Can break CMAKE builds.
This commit is contained in:
Max Howell 2012-02-16 17:12:53 +00:00
parent 4fa82d9e1f
commit ec66d1f956
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -697,17 +697,6 @@ def check_for_CLICOLOR_FORCE
end end
end end
def check_for_GREP_OPTIONS
target_var = ENV['GREP_OPTIONS'].to_s
unless target_var.empty? or target_var == '--color=auto'
puts <<-EOS.undent
GREP_OPTIONS was set to \"#{target_var}\".
Having GREP_OPTIONS set this way can cause CMake builds to fail.
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|
@ -863,7 +852,6 @@ module Homebrew extend self
check_for_dyld_vars check_for_dyld_vars
check_for_MACOSX_DEPLOYMENT_TARGET check_for_MACOSX_DEPLOYMENT_TARGET
check_for_CLICOLOR_FORCE check_for_CLICOLOR_FORCE
check_for_GREP_OPTIONS
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

@ -7,6 +7,7 @@ module HomebrewEnvExtension
delete('CDPATH') delete('CDPATH')
delete('CPPFLAGS') delete('CPPFLAGS')
delete('LDFLAGS') delete('LDFLAGS')
delete('GREP_OPTIONS') # can break CMake (lol)
self['MAKEFLAGS'] = "-j#{self.make_jobs}" self['MAKEFLAGS'] = "-j#{self.make_jobs}"