CompilerSelector: don't use non-existent compilers

2 files changed, 5 insertions, 7 deletions

diff --git a/Library/Homebrew/compilers.rb b/Library/Homebrew/compilers.rb
index 934c52cf2..f716256ef 100644
--- a/Library/Homebrew/compilers.rb
+++ b/Library/Homebrew/compilers.rb
@@ -1,11 +1,6 @@
 class Compiler < Struct.new(:name, :priority)
   def build
-    case name
-    when :clang, :llvm
-      MacOS.send("#{name}_build_version")
-    when :gcc
-      MacOS.gcc_42_build_version
-    end
+    MacOS.send("#{name}_build_version")
   end
 end
 
@@ -52,7 +47,9 @@ class CompilerSelector
     @old_compiler = old_compiler
     @compilers = CompilerQueue.new
     %w{clang llvm gcc}.map(&:to_sym).each do |cc|
-      @compilers << Compiler.new(cc, priority_for(cc))
+      unless MacOS.send("#{cc}_build_version").nil?
+        @compilers << Compiler.new(cc, priority_for(cc))
+      end
     end
   end
 
diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb
index e073eb07e..bb24d7a3c 100644
--- a/Library/Homebrew/macos.rb
+++ b/Library/Homebrew/macos.rb
@@ -129,6 +129,7 @@ module MacOS extend self
       $1.to_i
     end
   end
+  alias_method :gcc_build_version, :gcc_42_build_version
 
   def llvm_build_version
     # for Xcode 3 on OS X 10.5 this will not exist