diff options
| author | Mike McQuaid | 2017-01-17 10:07:29 +0000 |
|---|---|---|
| committer | GitHub | 2017-01-17 10:07:29 +0000 |
| commit | 85a3940dfa4a3df0759761cf6be916245fe749a3 (patch) | |
| tree | 980f256643d285e8b3d115118ef7d4b7b6819e04 /Library | |
| parent | 3d37e3b67fa0c007ab0d6b6cea35f203084b8905 (diff) | |
| parent | 6040456ea91add1d9f20820f6e23a47eb92bb4af (diff) | |
| download | brew-85a3940dfa4a3df0759761cf6be916245fe749a3.tar.bz2 | |
Merge pull request #1861 from MikeMcQuaid/unset-grep-options
Unset GREP_OPTIONS.
Diffstat (limited to 'Library')
| -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 |