More robust implementation of ENV.with_build_environment

2 files changed, 11 insertions, 8 deletions

diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index 52404a1c8..7ae8ecc0d 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -18,6 +18,17 @@ module EnvActivation
       extend(Stdenv)
     end
   end
+
+  def with_build_environment
+    old_env = to_hash.dup
+    tmp_env = to_hash.dup.extend(EnvActivation)
+    tmp_env.activate_extensions!
+    tmp_env.setup_build_environment
+    replace(tmp_env)
+    yield
+  ensure
+    replace(old_env)
+  end
 end
 
 ENV.extend(EnvActivation)
diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index b8d17b2c3..0b5fee954 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -70,14 +70,6 @@ module SharedEnvExtension
     prepend 'PATH', HOMEBREW_PREFIX/'bin', ':'
   end
 
-  def with_build_environment
-    old_env = to_hash
-    setup_build_environment
-    yield
-  ensure
-    replace(old_env)
-  end
-
   def fortran
     # superenv removes these PATHs, but this option needs them
     # TODO fix better, probably by making a super-fc