From d262f63ce5a7c3810abde1f66ee3bb99d56acdd0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 4 Jan 2018 15:35:39 +0200
Subject: Add support for variable aliases

---
 build2/target.cxx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'build2/target.cxx')

diff --git a/build2/target.cxx b/build2/target.cxx
index 90b2511..a5316ce 100644
--- a/build2/target.cxx
+++ b/build2/target.cxx
@@ -200,8 +200,11 @@ namespace build2
     pair<lookup, size_t> r (lookup (), 0);
 
     ++r.second;
-    if (auto p = vars.find (var))
-      r.first = lookup (p, &vars);
+    {
+      auto p (vars.find (var));
+      if (p.first != nullptr)
+        r.first = lookup (*p.first, p.second, vars);
+    }
 
     const target* g (nullptr);
 
@@ -216,8 +219,9 @@ namespace build2
            ? nullptr
            : group->adhoc_group () ? group->group : group))
       {
-        if (auto p = g->vars.find (var))
-          r.first = lookup (p, &g->vars);
+        auto p (g->vars.find (var));
+        if (p.first != nullptr)
+          r.first = lookup (*p.first, p.second, g->vars);
       }
     }
 
-- 
cgit v1.1