Attempt to fix opt-paths for all deps

Since we changed superenv to set a PATH without /usr/local, all deps need to have opt paths.

Fixes Homebrew/homebrew#15077.

1 files changed, 5 insertions, 4 deletions

diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb
index 80ad6f159..d635a04a4 100755
--- a/Library/Homebrew/build.rb
+++ b/Library/Homebrew/build.rb
@@ -69,7 +69,8 @@ def pre_superenv_hacks f
 end
 
 def install f
-  keg_only_deps = f.recursive_deps.uniq.select{|dep| dep.keg_only? }
+  deps = f.recursive_deps
+  keg_only_deps = deps.select{|dep| dep.keg_only? }
 
   pre_superenv_hacks(f)
   require 'superenv'
@@ -81,10 +82,10 @@ def install f
     f.recursive_requirements.each { |rq| rq.modify_build_environment }
   end
 
-  keg_only_deps.each do |dep|
-    opt = HOMEBREW_PREFIX/:opt/dep.name
+  deps.each do |dep|
+    opt = HOMEBREW_PREFIX/:opt/dep
     fixopt(dep) unless opt.directory?
-    if not superenv?
+    if not superenv? and dep.keg_only?
       ENV.prepend_path 'PATH', "#{opt}/bin"
       ENV.prepend_path 'PKG_CONFIG_PATH', "#{opt}/lib/pkgconfig"
       ENV.prepend_path 'PKG_CONFIG_PATH', "#{opt}/share/pkgconfig"