diff options
| author | Max Howell | 2012-02-16 17:12:53 +0000 |
|---|---|---|
| committer | Max Howell | 2012-02-16 18:19:00 +0000 |
| commit | ec66d1f956f229f822a93ab45853ce1b1ad68aa4 (patch) | |
| tree | 0c914ec798355f8346e27f26d80eb02f17723673 /Library | |
| parent | 4fa82d9e1f50068316934027dc12e57ed53603c6 (diff) | |
| download | brew-ec66d1f956f229f822a93ab45853ce1b1ad68aa4.tar.bz2 | |
Delete ENV[GREP_OPTIONS] and the related doctor check
Can break CMAKE builds.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/doctor.rb | 12 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 1 |
2 files changed, 1 insertions, 12 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index 6bfc792b7..5465a442f 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -697,17 +697,6 @@ def check_for_CLICOLOR_FORCE 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 # Other frameworks that are known to cause problems when present ["/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_MACOSX_DEPLOYMENT_TARGET check_for_CLICOLOR_FORCE - check_for_GREP_OPTIONS 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 2ace45b8e..609264cd1 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -7,6 +7,7 @@ module HomebrewEnvExtension delete('CDPATH') delete('CPPFLAGS') delete('LDFLAGS') + delete('GREP_OPTIONS') # can break CMake (lol) self['MAKEFLAGS'] = "-j#{self.make_jobs}" |