diff options
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index af15e3ce1..d1950ad62 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -151,17 +151,13 @@ class FormulaInstaller def necessary_deps ARGV.filter_for_dependencies do f.recursive_dependencies do |dependent, dep| - if dep.optional? || dep.recommended? - Dependency.prune unless dependent.build.with?(dep.name) - elsif dep.build? - Dependency.prune if install_bottle?(dependent) - end - - if f.build.universal? - dep.universal! unless dep.build? - end + dep.universal! if f.build.universal? && !dep.build? - if dep.satisfied? + if (dep.optional? || dep.recommended?) && dependent.build.without?(dep.name) + Dependency.prune + elsif dep.build? && install_bottle?(dependent) + Dependency.prune + elsif dep.satisfied? Dependency.prune elsif dep.installed? raise UnsatisfiedDependencyError.new(f, dep) |