aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/compilers.rb
diff options
context:
space:
mode:
authorMike McQuaid2016-05-22 09:40:08 +0100
committerMike McQuaid2016-05-22 09:40:08 +0100
commit375efe09455218d9929e41f16317074ccdf50f2a (patch)
tree4d7f48fd6cd36e00c5e24712e8f7a812e042253d /Library/Homebrew/compilers.rb
parent7b2d1a5b08f4da122d995bdf8ba437e3cb25dc95 (diff)
downloadbrew-375efe09455218d9929e41f16317074ccdf50f2a.tar.bz2
Remove LLVM-GCC support. (#252)
At this point it's never a good compiler to use so let's just remove it.
Diffstat (limited to 'Library/Homebrew/compilers.rb')
-rw-r--r--Library/Homebrew/compilers.rb12
1 files changed, 5 insertions, 7 deletions
diff --git a/Library/Homebrew/compilers.rb b/Library/Homebrew/compilers.rb
index 896b8f363..51f0919e5 100644
--- a/Library/Homebrew/compilers.rb
+++ b/Library/Homebrew/compilers.rb
@@ -5,7 +5,6 @@ module CompilerConstants
COMPILER_SYMBOL_MAP = {
"gcc-4.0" => :gcc_4_0,
"gcc-4.2" => :gcc,
- "llvm-gcc" => :llvm,
"clang" => :clang,
}
@@ -62,7 +61,6 @@ class CompilerFailure
:cxx11 => [
create(:gcc_4_0),
create(:gcc),
- create(:llvm),
create(:clang) { build 425 },
create(:gcc => "4.3"),
create(:gcc => "4.4"),
@@ -71,7 +69,6 @@ class CompilerFailure
],
:openmp => [
create(:clang),
- create(:llvm),
],
}
end
@@ -82,10 +79,9 @@ class CompilerSelector
Compiler = Struct.new(:name, :version)
COMPILER_PRIORITY = {
- :clang => [:clang, :gcc, :llvm, :gnu, :gcc_4_0],
- :gcc => [:gcc, :llvm, :gnu, :clang, :gcc_4_0],
- :llvm => [:llvm, :gcc, :gnu, :clang, :gcc_4_0],
- :gcc_4_0 => [:gcc_4_0, :gcc, :llvm, :gnu, :clang],
+ :clang => [:clang, :gcc, :gnu, :gcc_4_0],
+ :gcc => [:gcc, :gnu, :clang, :gcc_4_0],
+ :gcc_4_0 => [:gcc_4_0, :gcc, :gnu, :clang],
}
def self.select_for(formula, compilers = self.compilers)
@@ -121,6 +117,8 @@ class CompilerSelector
version = compiler_version(name)
yield Compiler.new(name, version) if version
end
+ when :llvm
+ # no-op. DSL supported, compiler is not.
else
version = compiler_version(compiler)
yield Compiler.new(compiler, version) if version