More robust implementation of ENV.with_build_environment

1 files changed, 11 insertions, 0 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)