From 3c0bf7825ce2aaa8f0c5a29757ce61bbbba40b5c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 17 Apr 2015 15:25:00 +0200
Subject: Search in target group during variable lookup

---
 build/target.cxx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'build/target.cxx')

diff --git a/build/target.cxx b/build/target.cxx
index cb751ad..4f06596 100644
--- a/build/target.cxx
+++ b/build/target.cxx
@@ -56,10 +56,14 @@ namespace build
   {
     auto i (vars.find (var));
 
-    return i != vars.end ()
+    if (i != vars.end ())
       // @@ Same issue as in variable_map: need ro_value_proxy.
-      ? value_proxy (&const_cast<value_ptr&> (i->second), &vars)
-      : base_scope ()[var];
+      return value_proxy (&const_cast<value_ptr&> (i->second), &vars);
+
+    if (group != nullptr)
+      return (*group)[var];
+
+    return base_scope ()[var];
   }
 
   value_proxy target::
-- 
cgit v1.1