Revert "Remove conditional"

This method may see values originating HOMEBREW_CC.

This reverts commit 9c74f42962090c016143744b057e13aa75d9b13e.
This commit is contained in:
Jack Nagel 2015-05-17 19:18:32 -04:00
parent 3649b31765
commit 703d8a1aa3

View File

@ -108,11 +108,11 @@ class CompilerSelector
when :gnu
GNU_GCC_VERSIONS.reverse_each do |v|
name = "gcc-#{v}"
version = versions.non_apple_gcc_version(name)
version = compiler_version(name)
yield Compiler.new(name, version) if version
end
else
version = versions.send("#{compiler}_build_version")
version = compiler_version(compiler)
yield Compiler.new(compiler, version) if version
end
end
@ -121,4 +121,13 @@ class CompilerSelector
def fails_with?(compiler)
failures.any? { |failure| failure === compiler }
end
def compiler_version(name)
case name
when GNU_GCC_REGEXP
versions.non_apple_gcc_version(name)
else
versions.send("#{name}_build_version")
end
end
end