Handle optional build-time deps correctly

2013-07-22 21:36:11 -05:00 · 2013-07-22 21:36:11 -05:00 · 93af660c7f
commit 93af660c7f
parent fcfc53df33
1 changed files with 4 additions and 4 deletions
--- a/Library/Homebrew/build.rb
+++ b/Library/Homebrew/build.rb
@ -94,10 +94,10 @@ class Build

  def expand_deps
    f.recursive_dependencies do |dependent, dep|
-      if dep.optional? || dep.recommended?
-        Dependency.prune unless dependent.build.with?(dep.name)
-      elsif dep.build?
-        Dependency.prune unless dependent == f
+      if (dep.optional? || dep.recommended?) && dependent.build.without?(dep.name)
+        Dependency.prune
+      elsif dep.build? && dependent != f
+        Dependency.prune
      end
    end
  end