diff options
| author | Mike McQuaid | 2014-04-29 08:51:56 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2014-04-29 08:51:56 +0100 |
| commit | 2c3b04fb264a82796757dc3cc0bf25fa1ddaba6b (patch) | |
| tree | b6c8a3d74edcc53caba5155b13ab45b766e9710a /Library | |
| parent | b6a0b953804699d4893e0fcee4f5713968a70185 (diff) | |
| download | brew-2c3b04fb264a82796757dc3cc0bf25fa1ddaba6b.tar.bz2 | |
ENV/shared: use homebrew/versions GCC if installed
Closes Homebrew/homebrew#28820.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/extend/ENV/shared.rb | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb index 2964fbd16..f4aac1d4e 100644 --- a/Library/Homebrew/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/ENV/shared.rb @@ -187,10 +187,18 @@ module SharedEnvExtension def gcc_version_formula(version) gcc_formula = Formulary.factory("gcc") - return gcc_formula if gcc_formula.version.to_s.include?(version) - 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 def warn_about_non_apple_gcc(gcc) |
