admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

build: call satisified? before modifying env.

Browse Source 
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.
This commit is contained in:
ilovezfs 2018-01-22 23:07:27 -08:00
parent 97f0ef4c49
commit 7879272689
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/build.rb
View File

@ -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)