diff options
| author | Mike McQuaid | 2017-01-16 20:35:56 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2017-01-16 20:35:56 +0000 |
| commit | 6040456ea91add1d9f20820f6e23a47eb92bb4af (patch) | |
| tree | df9ff1163cdf82bc1d5342f4ddab6598cfad466f /Library/Homebrew | |
| parent | 10b8d27d118c5db7ce4293861cded28e8516e849 (diff) | |
| download | brew-6040456ea91add1d9f20820f6e23a47eb92bb4af.tar.bz2 | |
Unset GREP_OPTIONS.
Users may have this set, breaking grep's output.
Fixes #1430.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/brew.sh | 3 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ENV/shared.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 92953001d..81a52f474 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -82,6 +82,9 @@ unset GEM_PATH # bash processes inside builds unset BASH_ENV +# Users may have this set, breaking grep's output. +unset GREP_OPTIONS + HOMEBREW_SYSTEM="$(uname -s)" case "$HOMEBREW_SYSTEM" in Darwin) HOMEBREW_MACOS="1" ;; diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb index a93c1ee1f..7b468574a 100644 --- a/Library/Homebrew/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/ENV/shared.rb @@ -17,7 +17,7 @@ module SharedEnvExtension FC_FLAG_VARS = %w[FCFLAGS FFLAGS].freeze # @private SANITIZED_VARS = %w[ - CDPATH GREP_OPTIONS CLICOLOR_FORCE + CDPATH CLICOLOR_FORCE CPATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH OBJC_INCLUDE_PATH CC CXX OBJC OBJCXX CPP MAKE LD LDSHARED CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS LDFLAGS CPPFLAGS |