Remove LLVM-GCC support. (#252)

At this point it's never a good compiler to use so let's just remove it.

4 files changed, 8 insertions, 13 deletions

diff --git a/Library/Homebrew/test/test_ENV.rb b/Library/Homebrew/test/test_ENV.rb
index 1d3290b5b..74d1cff79 100644
--- a/Library/Homebrew/test/test_ENV.rb
+++ b/Library/Homebrew/test/test_ENV.rb
@@ -7,7 +7,6 @@ module SharedEnvTests
   end
 
   def test_switching_compilers
-    @env.llvm
     @env.clang
     assert_nil @env["LD"]
     assert_equal @env["OBJC"], @env["CC"]
@@ -106,7 +105,7 @@ module SharedEnvTests
   end
 
   def test_switching_compilers_updates_compiler
-    [:clang, :llvm, :gcc, :gcc_4_0].each do |compiler|
+    [:clang, :gcc, :gcc_4_0].each do |compiler|
       @env.send(compiler)
       assert_equal compiler, @env.compiler
     end
diff --git a/Library/Homebrew/test/test_compiler_selector.rb b/Library/Homebrew/test/test_compiler_selector.rb
index 907252b68..d030d48ce 100644
--- a/Library/Homebrew/test/test_compiler_selector.rb
+++ b/Library/Homebrew/test/test_compiler_selector.rb
@@ -12,12 +12,11 @@ class CompilerSelectorTests < Homebrew::TestCase
 
   class CompilerVersions
     attr_accessor :gcc_4_0_build_version, :gcc_build_version,
-      :llvm_build_version, :clang_build_version
+      :clang_build_version
 
     def initialize
       @gcc_4_0_build_version = nil
       @gcc_build_version = 5666
-      @llvm_build_version = 2336
       @clang_build_version = 425
     end
 
@@ -73,7 +72,7 @@ class CompilerSelectorTests < Homebrew::TestCase
 
   def test_mixed_failures_1
     @f << :clang << :gcc
-    assert_equal :llvm, actual_cc
+    assert_equal "gcc-4.8", actual_cc
   end
 
   def test_mixed_failures_2
@@ -96,9 +95,9 @@ class CompilerSelectorTests < Homebrew::TestCase
     assert_equal "gcc-4.7", actual_cc
   end
 
-  def test_llvm_precedence
+  def test_gcc_precedence
     @f << :clang << :gcc
-    assert_equal :llvm, actual_cc
+    assert_equal "gcc-4.8", actual_cc
   end
 
   def test_missing_gcc
@@ -108,7 +107,7 @@ class CompilerSelectorTests < Homebrew::TestCase
   end
 
   def test_missing_llvm_and_gcc
-    @versions.gcc_build_version = @versions.llvm_build_version = nil
+    @versions.gcc_build_version = nil
     @f << :clang << { :gcc => "4.8" } << { :gcc => "4.7" }
     assert_raises(CompilerSelectionError) { actual_cc }
   end
diff --git a/Library/Homebrew/test/test_formula_installer.rb b/Library/Homebrew/test/test_formula_installer.rb
index 1cdf54575..b592b6dfa 100644
--- a/Library/Homebrew/test/test_formula_installer.rb
+++ b/Library/Homebrew/test/test_formula_installer.rb
@@ -81,12 +81,12 @@ class InstallTests < Homebrew::TestCase
   def test_not_poured_from_bottle_when_compiler_specified
     assert_nil ARGV.cc
 
-    cc_arg = "--cc=llvm-gcc"
+    cc_arg = "--cc=clang"
     ARGV << cc_arg
     begin
       temporary_install(TestballBottle.new) do |f|
         tab = Tab.for_formula(f)
-        assert_equal "llvm", tab.compiler
+        assert_equal "clang", tab.compiler
       end
     ensure
       ARGV.delete_if { |x| x == cc_arg }
diff --git a/Library/Homebrew/test/test_stdlib.rb b/Library/Homebrew/test/test_stdlib.rb
index eb423f283..ee53e7c8c 100644
--- a/Library/Homebrew/test/test_stdlib.rb
+++ b/Library/Homebrew/test/test_stdlib.rb
@@ -6,7 +6,6 @@ class CxxStdlibTests < Homebrew::TestCase
   def setup
     @clang = CxxStdlib.create(:libstdcxx, :clang)
     @gcc   = CxxStdlib.create(:libstdcxx, :gcc)
-    @llvm  = CxxStdlib.create(:libstdcxx, :llvm)
     @gcc4  = CxxStdlib.create(:libstdcxx, :gcc_4_0)
     @gcc48 = CxxStdlib.create(:libstdcxx, "gcc-4.8")
     @gcc49 = CxxStdlib.create(:libstdcxx, "gcc-4.9")
@@ -16,7 +15,6 @@ class CxxStdlibTests < Homebrew::TestCase
 
   def test_apple_libstdcxx_intercompatibility
     assert @clang.compatible_with?(@gcc)
-    assert @clang.compatible_with?(@llvm)
     assert @clang.compatible_with?(@gcc4)
   end
 
@@ -44,7 +42,6 @@ class CxxStdlibTests < Homebrew::TestCase
   def test_apple_compiler_reporting
     assert_predicate @clang, :apple_compiler?
     assert_predicate @gcc, :apple_compiler?
-    assert_predicate @llvm, :apple_compiler?
     assert_predicate @gcc4, :apple_compiler?
     refute_predicate @gcc48, :apple_compiler?
   end