1 files changed, 2 insertions, 10 deletions
diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb
index 69ef1a6de..de9d503f3 100755
--- a/Library/Homebrew/build.rb
+++ b/Library/Homebrew/build.rb
@@ -120,12 +120,12 @@ class Build
       ENV.keg_only_deps = keg_only_deps.map(&:to_s)
       ENV.deps = deps.map { |d| d.to_formula.to_s }
       ENV.x11 = reqs.any? { |rq| rq.kind_of?(X11Dependency) }
-      ENV.setup_build_environment
+      ENV.setup_build_environment(f)
       post_superenv_hacks
       reqs.each(&:modify_build_environment)
       deps.each(&:modify_build_environment)
     else
-      ENV.setup_build_environment
+      ENV.setup_build_environment(f)
       reqs.each(&:modify_build_environment)
       deps.each(&:modify_build_environment)
 
@@ -141,14 +141,6 @@ class Build
       end
     end
 
-    if f.fails_with? ENV.compiler
-      begin
-        ENV.send CompilerSelector.new(f).compiler
-      rescue CompilerSelectionError => e
-        raise e.message
-      end
-    end
-
     # We only support libstdc++ right now
     stdlib_in_use = CxxStdlib.new(:libstdcxx, ENV.compiler)