From 787927268929f27e05edd72a5a2a5ce456aaabb3 Mon Sep 17 00:00:00 2001
From: ilovezfs
Date: Mon, 22 Jan 2018 23:07:27 -0800
Subject: 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.
---
 Library/Homebrew/build.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Library')

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)
 
-- 
cgit v1.2.3