Simplify gcc_version_formula

suddy · Jun 22, 2015 · f1bf81d · f1bf81d
1 parent 1ce0478
commit f1bf81d
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
@@ -192,20 +192,10 @@ def gcc_version_formula(name)
     version = name[GNU_GCC_REGEXP, 1]
     gcc_version_name = "gcc#{version.delete('.')}"
 
-    gcc_path = HOMEBREW_PREFIX.join("opt", "gcc", "bin", name)
-    gcc_formula = 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
+    if HOMEBREW_PREFIX.join("opt", "gcc", "bin", name).exist?
+      Formulary.factory("gcc")
     else
-      gcc_formula
+      Formulary.factory(gcc_version_name)
     end
   end