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

Fix caching of gcc_42_build_version

Browse Source
This commit is contained in:
Jack Nagel 2014-05-01 16:57:14 -05:00
parent 3040bd3aae
commit 7052fe89b1
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,15 +131,10 @@ module OS
def gcc_42_build_version def gcc_42_build_version
@gcc_42_build_version ||= @gcc_42_build_version ||=
begin begin
gcc = MacOS.locate('gcc-4.2') gcc = MacOS.locate("gcc-4.2") || HOMEBREW_PREFIX.join("opt/apple-gcc42/bin/gcc-4.2")
gcc ||= Formula.factory('apple-gcc42').opt_prefix/'bin/gcc-4.2' rescue nil if gcc && gcc.exist? && gcc.realpath.basename.to_s !~ /^llvm/
raise if gcc.nil? || !gcc.exist? %x{#{gcc} --version}[/build (\d{4,})/, 1].to_i
rescue end
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