MacOS.gcc_build_version: find GCC when unlinked
MacOS.gcc_42_build_version was returning nil if apple-gcc42 was installed but unlinked, which was disjoint with how other parts of Homebrew tried to see if it was present.
This commit is contained in:
parent
4d6dd40bad
commit
a79bc02620
@ -130,8 +130,15 @@ module OS
|
||||
|
||||
def gcc_42_build_version
|
||||
@gcc_42_build_version ||=
|
||||
if (path = locate("gcc-4.2")) && path.realpath.basename.to_s !~ /^llvm/
|
||||
%x{#{path} --version}[/build (\d{4,})/, 1].to_i
|
||||
begin
|
||||
gcc = MacOS.locate('gcc-4.2') || Formula.factory('apple-gcc42').opt_prefix/'bin/gcc-4.2'
|
||||
raise unless gcc.exist?
|
||||
rescue
|
||||
gcc = nil
|
||||
end
|
||||
|
||||
if gcc && gcc.realpath.basename.to_s !~ /^llvm/
|
||||
%x{#{gcc} --version}[/build (\d{4,})/, 1].to_i
|
||||
end
|
||||
end
|
||||
alias_method :gcc_build_version, :gcc_42_build_version
|
||||
|
Loading…
x
Reference in New Issue
Block a user