From 3f11f1a0def50bba3349c0dc948f84c8bc82eb04 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 21 Jun 2015 21:18:24 -0400 Subject: [PATCH] Eliminate special case for core gcc --- Library/Homebrew/extend/ENV/shared.rb | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb index bce893c915..2b13490d5e 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