formula_installer: force fewer default formulae

Don't force a default formulae install if a requirement is satisfied if
we're building a bottle and it's a build-time dependency.
This commit is contained in:
Mike McQuaid 2017-11-25 12:48:30 +00:00
parent 236b017230
commit 718f52eda4

View File

@ -449,7 +449,7 @@ class FormulaInstaller
if (req.optional? || req.recommended?) && build.without?(req) if (req.optional? || req.recommended?) && build.without?(req)
Requirement.prune Requirement.prune
elsif req.build? && install_bottle_for_dependent elsif req.build? && use_default_formula
Requirement.prune Requirement.prune
elsif install_requirement_formula?(req_dependency, req, install_bottle_for_dependent) elsif install_requirement_formula?(req_dependency, req, install_bottle_for_dependent)
deps.unshift(req_dependency) deps.unshift(req_dependency)