From 87e77350125602e6114e43ccc349f0287f8f5349 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Mon, 22 Jun 2015 21:00:40 -0400
Subject: [PATCH] Ask the formula object for the opt path

---
 Library/Homebrew/extend/ENV/shared.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index f75d40ecf6..6256f85642 100644
--- 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