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

Simplify gcc_version_formula

Browse Source
This commit is contained in:
Jack Nagel 2015-06-21 21:18:24 -04:00
parent 1ce04786d6
commit f1bf81dd55
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,20 +192,10 @@ module SharedEnvExtension
version = name[GNU_GCC_REGEXP, 1] version = name[GNU_GCC_REGEXP, 1]
gcc_version_name = "gcc#{version.delete('.')}" gcc_version_name = "gcc#{version.delete('.')}"
gcc_path = HOMEBREW_PREFIX.join("opt", "gcc", "bin", name) if HOMEBREW_PREFIX.join("opt", "gcc", "bin", name).exist?
gcc_formula = Formulary.factory "gcc" Formulary.factory("gcc")
gcc_versions_path = HOMEBREW_PREFIX.join("opt", gcc_version_name, "bin", name)
if gcc_path.exist?
gcc_formula
elsif gcc_versions_path.exist?
Formulary.factory gcc_version_name
elsif gcc_formula.version.to_s.include?(version)
gcc_formula
elsif (gcc_versions_formula = Formulary.factory(gcc_version_name) rescue nil)
gcc_versions_formula
else else
gcc_formula Formulary.factory(gcc_version_name)
end end
end end