CompilerSelector: don't use non-existent compilers

This commit is contained in:
Jack Nagel 2013-04-01 13:23:09 -05:00
parent c61c1fb813
commit c679e557ba
2 changed files with 5 additions and 7 deletions

View File

@ -1,11 +1,6 @@
class Compiler < Struct.new(:name, :priority) class Compiler < Struct.new(:name, :priority)
def build def build
case name MacOS.send("#{name}_build_version")
when :clang, :llvm
MacOS.send("#{name}_build_version")
when :gcc
MacOS.gcc_42_build_version
end
end end
end end
@ -52,7 +47,9 @@ class CompilerSelector
@old_compiler = old_compiler @old_compiler = old_compiler
@compilers = CompilerQueue.new @compilers = CompilerQueue.new
%w{clang llvm gcc}.map(&:to_sym).each do |cc| %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
end end

View File

@ -129,6 +129,7 @@ module MacOS extend self
$1.to_i $1.to_i
end end
end end
alias_method :gcc_build_version, :gcc_42_build_version
def llvm_build_version def llvm_build_version
# for Xcode 3 on OS X 10.5 this will not exist # for Xcode 3 on OS X 10.5 this will not exist