diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb index 461d711181..25e2b31c4d 100755 --- a/Library/Homebrew/build.rb +++ b/Library/Homebrew/build.rb @@ -140,7 +140,7 @@ class Build if f.fails_with? ENV.compiler begin - ENV.send CompilerSelector.new(f, ENV.compiler).compiler + ENV.send CompilerSelector.new(f).compiler rescue CompilerSelectionError => e raise e.message end diff --git a/Library/Homebrew/compilers.rb b/Library/Homebrew/compilers.rb index 80826237ac..3aaaecbc87 100644 --- a/Library/Homebrew/compilers.rb +++ b/Library/Homebrew/compilers.rb @@ -35,9 +35,8 @@ class CompilerQueue end class CompilerSelector - def initialize(f, old_compiler) + def initialize(f) @f = f - @old_compiler = old_compiler @compilers = CompilerQueue.new %w{clang llvm gcc gcc_4_0}.map(&:to_sym).each do |cc| unless MacOS.send("#{cc}_build_version").nil? diff --git a/Library/Homebrew/test/test_compiler_selector.rb b/Library/Homebrew/test/test_compiler_selector.rb index 4e104a271e..17c3b04496 100644 --- a/Library/Homebrew/test/test_compiler_selector.rb +++ b/Library/Homebrew/test/test_compiler_selector.rb @@ -27,7 +27,7 @@ class CompilerSelectorTests < Test::Unit::TestCase end def actual_cc - CompilerSelector.new(@f, @cc).compiler + CompilerSelector.new(@f).compiler end def test_all_compiler_failures