diff options
| -rwxr-xr-x | Library/Homebrew/build.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb index 561017296..2390b811d 100755 --- a/Library/Homebrew/build.rb +++ b/Library/Homebrew/build.rb @@ -69,8 +69,18 @@ def pre_superenv_hacks f not ARGV.include? '--env=super' end +def expand_deps f + 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 + end + end.map(&:to_formula) +end + def install f - deps = f.recursive_dependencies.map(&:to_formula) + deps = expand_deps(f) keg_only_deps = deps.select(&:keg_only?) pre_superenv_hacks(f) @@ -83,7 +93,7 @@ def install f if superenv? ENV.deps = keg_only_deps.map(&:to_s) - ENV.all_deps = f.recursive_dependencies.map(&:to_s) + ENV.all_deps = deps.map(&:to_s) ENV.x11 = f.recursive_requirements.detect { |rq| rq.kind_of?(X11Dependency) } ENV.setup_build_environment post_superenv_hacks(f) |