diff options
| author | Jack Nagel | 2013-07-22 21:36:11 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-07-22 21:36:11 -0500 |
| commit | 35752b90380e63f4c74d9317686754b5600d23bc (patch) | |
| tree | 0ce5f7802023e685a82f6bf3f3a2617befe8dcaa /Library | |
| parent | f4aa7de35dd307e32d428dc754b28a08b036382e (diff) | |
| download | homebrew-35752b90380e63f4c74d9317686754b5600d23bc.tar.bz2 | |
Handle optional build-time deps correctly
Diffstat (limited to 'Library')
| -rwxr-xr-x | Library/Homebrew/build.rb | 8 |
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 |
