Ask the formula object for the opt path

2015-06-22 21:00:40 -04:00 · 2015-06-22 21:00:40 -04:00 · 87e7735012
commit 87e7735012
parent 7a75bbd85a
1 changed files with 3 additions and 2 deletions
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@ -192,8 +192,9 @@ module SharedEnvExtension
    version = name[GNU_GCC_REGEXP, 1]
    gcc_version_name = "gcc#{version.delete('.')}"

-    if HOMEBREW_PREFIX.join("opt", "gcc", "bin", name).exist?
-      Formulary.factory("gcc")
+    gcc = Formulary.factory("gcc")
+    if gcc.opt_bin.join(name).exist?
+      gcc
    else
      Formulary.factory(gcc_version_name)
    end