aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2013-01-27 20:42:03 -0600
committerJack Nagel2013-01-27 21:20:09 -0600
commitb90af5be1388ac7b7e5f2038c5d1d875f8de52d5 (patch)
treed5d31b0737bc1063cefc46f7f8485cb659a67702 /Library
parent5e83629119c47436e5f8fefa90711062e4f3ea64 (diff)
downloadbrew-b90af5be1388ac7b7e5f2038c5d1d875f8de52d5.tar.bz2
Consider correct dependent when skipping build-time deps
We skip build-time deps when installing from bottles. However, the current logic only considers the root, rather than the actual dependent formula. Given A (bottled) |__B (not bottled) |__C (build-time) C will be pruned from the effective dependency tree of A. This is wrong, because C is required in order to build B. Fix this by examining the current dependent rather than the root. Fixes Homebrew/homebrew#17356.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/formula_installer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 67c90cd79..adafbc11d 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -136,7 +136,7 @@ class FormulaInstaller
if dep.optional? || dep.recommended?
Dependency.prune unless dependent.build.with?(dep.name)
elsif dep.build?
- Dependency.prune if pour_bottle?
+ Dependency.prune if install_bottle?(dependent)
end
if f.build.universal?