2 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 9d6f525ba..81b546388 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -572,7 +572,7 @@ class Formula
     logfn = "#{logd}/%02d.%s" % [@exec_count, File.basename(cmd).split(' ').first]
     mkdir_p(logd)
 
-    fork do
+    pid = fork do
       ENV['HOMEBREW_CC_LOG_PATH'] = logfn
 
       # TODO system "xcodebuild" is deprecated, this should be removed soon.
@@ -603,7 +603,7 @@ class Formula
         puts buf if ARGV.verbose?
       end
 
-      Process.wait
+      Process.wait(pid)
 
       $stdout.flush
 
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb
index 8fa86797f..ac84c1602 100644
--- a/Library/Homebrew/utils.rb
+++ b/Library/Homebrew/utils.rb
@@ -84,8 +84,8 @@ def interactive_shell f=nil
     ENV['HOMEBREW_DEBUG_INSTALL'] = f.name
   end
 
-  fork {exec ENV['SHELL'] }
-  Process.wait
+  Process.wait fork { exec ENV['SHELL'] }
+
   unless $?.success?
     puts "Aborting due to non-zero exit status"
     exit $?