diff options
| author | Jack Nagel | 2014-09-18 16:43:56 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-09-18 16:44:20 -0500 |
| commit | 662f887e9ad581872f2bddeace54d3019382d3c1 (patch) | |
| tree | 973cdc6635b26d1d38b8886868c4b956480bb017 /Library | |
| parent | c5f2f6b539247a00d446a6895883c2389a82f0d3 (diff) | |
| download | brew-662f887e9ad581872f2bddeace54d3019382d3c1.tar.bz2 | |
Call reset in the superclass implementation of setup_build_environment
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV/shared.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ENV/std.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ENV/super.rb | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb index 87347a89e..943452c4b 100644 --- a/Library/Homebrew/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/ENV/shared.rb @@ -29,6 +29,7 @@ module SharedEnvExtension def setup_build_environment(formula=nil) @formula = formula + reset end def reset diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index e15012775..adbda0804 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -17,7 +17,6 @@ module Stdenv def setup_build_environment(formula=nil) super - reset if MacOS.version >= :mountain_lion # Mountain Lion's sed is stricter, and errors out when diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 702114cea..31718a2b9 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -35,7 +35,6 @@ module Superenv def setup_build_environment(formula=nil) super - reset send(compiler) self['MAKEFLAGS'] ||= "-j#{determine_make_jobs}" |