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