diff options
| author | Mike McQuaid | 2014-04-29 08:51:56 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2014-04-29 08:51:56 +0100 |
| commit | a42794c51ee9c5261802a6b726035bcdb58e0619 (patch) | |
| tree | 362ab8dbf81a039c2b62eb47e4e38fd020de0504 /Library/Homebrew/extend | |
| parent | 809cf9e440d60dbf5988640b956eb5e59202b801 (diff) | |
| download | homebrew-a42794c51ee9c5261802a6b726035bcdb58e0619.tar.bz2 | |
ENV/shared: use homebrew/versions GCC if installed
Closes #28820.
Diffstat (limited to 'Library/Homebrew/extend')
| -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) |
