aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2013-07-22 21:36:11 -0500
committerJack Nagel2013-07-22 21:36:11 -0500
commit93af660c7fd043d1dce809a7bfb5017252f28990 (patch)
tree6547a5d0ac8309728e9204ee603304098fa001c0
parentfcfc53df3314136cd8298e8971ea41d7402b7064 (diff)
downloadbrew-93af660c7fd043d1dce809a7bfb5017252f28990.tar.bz2
Handle optional build-time deps correctly
-rwxr-xr-xLibrary/Homebrew/build.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb
index 25e2b31c4..7d88a74cf 100755
--- 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