diff options
| author | Jack Nagel | 2013-07-26 15:05:37 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-07-26 15:05:42 -0500 |
| commit | 281eea0da294a643522f3d002e9f7363f490f136 (patch) | |
| tree | 789def5ab74b97b634e699413e1764da26c6133c /Library | |
| parent | 4daa911a64112a3e93e5b90a0a88fa751f647cba (diff) | |
| download | homebrew-281eea0da294a643522f3d002e9f7363f490f136.tar.bz2 | |
Fix expansion of deps with --build-bottle
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index d4e4e8dcc..99f48d546 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -169,13 +169,19 @@ class FormulaInstaller # All dependencies that we must install before installing f. # These do not honor flags like --HEAD and --devel. def necessary_deps + # FIXME: can't check this inside the block for the top-level dependent + # because it depends on the contents of ARGV. + pour_bottle = pour_bottle? + ARGV.filter_for_dependencies do f.recursive_dependencies do |dependent, dep| dep.universal! if f.build.universal? && !dep.build? if (dep.optional? || dep.recommended?) && dependent.build.without?(dep.name) Dependency.prune - elsif dep.build? && install_bottle?(dependent) + elsif dep.build? && dependent == f && pour_bottle + Dependency.prune + elsif dep.build? && dependent != f && install_bottle?(dependent) Dependency.prune elsif dep.satisfied? Dependency.skip |