diff options
| author | ilovezfs | 2018-01-22 23:07:27 -0800 |
|---|---|---|
| committer | ilovezfs | 2018-01-22 23:07:27 -0800 |
| commit | 787927268929f27e05edd72a5a2a5ce456aaabb3 (patch) | |
| tree | 50ff493ed5cf75ad2df5c92f24e518da03efb5e4 /Library/Homebrew | |
| parent | 97f0ef4c49d0f2f2a62a82e7ca21945d7cbe2c7c (diff) | |
| download | brew-787927268929f27e05edd72a5a2a5ce456aaabb3.tar.bz2 | |
build: call satisified? before modifying env.
Requirement#modify_build_environment may depend on the side effects of
Requirement#satisfied?, so make sure the latter is called at least once
for each requirement during formula installation. Prior to b70b5429d09,
Requirement#satisfied? would usually be called during Build#expand_reqs,
but that is longer the case.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/build.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb index d61c3672a..263bac2d5 100644 --- a/Library/Homebrew/build.rb +++ b/Library/Homebrew/build.rb @@ -81,10 +81,12 @@ class Build ENV.x11 = reqs.any? { |rq| rq.is_a?(X11Requirement) } ENV.setup_build_environment(formula) post_superenv_hacks + reqs.each(&:satisfied?) reqs.each(&:modify_build_environment) deps.each(&:modify_build_environment) else ENV.setup_build_environment(formula) + reqs.each(&:satisfied?) reqs.each(&:modify_build_environment) deps.each(&:modify_build_environment) |