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

shared: don't use Formula.factory unnecessarily.

Browse Source 
Instead check if the path exists by using opt.
This commit is contained in:
Mike McQuaid 2014-05-05 13:39:10 +01:00
parent 5955f2a395
commit 1b0647d747
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/extend/ENV/shared.rb
View File

@ -98,9 +98,7 @@ module SharedEnvExtension
end end
end end
elsif ARGV.include? '--use-gcc' elsif ARGV.include? '--use-gcc'
gcc_installed = Formula.factory('apple-gcc42').installed? rescue false if MacOS.locate("gcc-4.2") || HOMEBREW_PREFIX.join("opt/apple-gcc42/bin/gcc-4.2").exist?
# fall back to something else on systems without Apple gcc
if MacOS.locate('gcc-4.2') || gcc_installed
:gcc :gcc
else else
raise "gcc-4.2 not found!" raise "gcc-4.2 not found!"