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

ENV/shared: use homebrew/versions GCC if installed

Browse Source 
Closes Homebrew/homebrew#28820.
This commit is contained in:
Mike McQuaid 2014-04-29 08:51:56 +01:00
parent b6a0b95380
commit 2c3b04fb26
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,10 +187,18 @@ module SharedEnvExtension
def gcc_version_formula(version) def gcc_version_formula(version)
gcc_formula = Formulary.factory("gcc") gcc_formula = Formulary.factory("gcc")
return gcc_formula if gcc_formula.version.to_s.include?(version)
gcc_name = 'gcc' + version.delete('.') gcc_name = 'gcc' + version.delete('.')
Formulary.factory(gcc_name) gcc_versions_formula = Formulary.factory(gcc_name)
if gcc_formula.opt_prefix.exist?
gcc_formula
elsif gcc_versions_formula.opt_prefix.exist?
gcc_versions_formula
elsif gcc_formula.version.to_s.include?(version)
gcc_formula
else
gcc_versions_formula
end
end end
def warn_about_non_apple_gcc(gcc) def warn_about_non_apple_gcc(gcc)