admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

MacOS.gcc_build_version: find GCC when unlinked

Browse Source 
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:
Misty De Meo 2013-10-19 23:09:09 -07:00
parent 4d6dd40bad
commit a79bc02620
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/os/mac.rb
View File

@ -130,8 +130,15 @@ module OS
def gcc_42_build_version def gcc_42_build_version
@gcc_42_build_version ||= @gcc_42_build_version ||=
if (path = locate("gcc-4.2")) && path.realpath.basename.to_s !~ /^llvm/ begin
%x{#{path} --version}[/build (\d{4,})/, 1].to_i 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
end end
alias_method :gcc_build_version, :gcc_42_build_version alias_method :gcc_build_version, :gcc_42_build_version