aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2015-06-21 21:18:24 -0400
committerJack Nagel2015-06-21 21:18:24 -0400
commit3f11f1a0def50bba3349c0dc948f84c8bc82eb04 (patch)
tree7312e9573358f35d4d2a7183ae899d1abb3880cb /Library
parent2db59be452517c514ab3cb5c936bc90dfef98781 (diff)
downloadbrew-3f11f1a0def50bba3349c0dc948f84c8bc82eb04.tar.bz2
Eliminate special case for core gcc
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/extend/ENV/shared.rb17
1 files changed, 3 insertions, 14 deletions
diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index bce893c91..2b13490d5 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -221,21 +221,10 @@ module SharedEnvExtension
EOS
end
- if gcc_formula.name == "gcc"
- return if gcc_formula.opt_prefix.exist?
+ unless gcc_formula.opt_prefix.exist?
raise <<-EOS.undent
- The Homebrew GCC was not installed.
- You must:
- brew install gcc
- EOS
- end
-
- if !gcc_formula.opt_prefix.exist?
- raise <<-EOS.undent
- The requested Homebrew GCC, #{gcc_version_name}, was not installed.
- You must:
- brew tap homebrew/versions
- brew install #{gcc_version_name}
+ The requested Homebrew GCC was not installed. You must:
+ brew install #{gcc_formula.full_name}
EOS
end
end