From 3b0df49b8828921edfb7b764b0628fb164dab852 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 9 Nov 2017 13:33:06 +0200
Subject: Initial support for prerequisite-specific variables, use for
 bin.whole

---
 build2/cc/link.cxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'build2/cc/link.cxx')

diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx
index 4e22151..7f1e8d8 100644
--- a/build2/cc/link.cxx
+++ b/build2/cc/link.cxx
@@ -814,9 +814,11 @@ namespace build2
             // that the variable is not overridable so we omit find_override()
             // calls.
             //
-            //@@ TODO: prerequisite-specific lookup.
-            //
-            lookup l (pt->find_original (var, true).first);
+            lookup l (p.prerequisite.vars[var]);
+
+            if (!l.defined ())
+              l = pt->find_original (var, true).first;
+
             if (!l.defined ())
             {
               bool g (pt->group != nullptr);
-- 
cgit v1.1