Call reset in the superclass implementation of setup_build_environment

2014-09-18 16:43:56 -05:00 · 2014-09-18 16:43:56 -05:00 · 662f887e9a
commit 662f887e9a
parent c5f2f6b539
3 changed files with 1 additions and 2 deletions
--- 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
--- 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
--- 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}"