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/config/utility.cxx | 2 +-
 build2/config/utility.txx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'build2/config')

diff --git a/build2/config/utility.cxx b/build2/config/utility.cxx
index 1c80d13..08795d7 100644
--- a/build2/config/utility.cxx
+++ b/build2/config/utility.cxx
@@ -61,7 +61,7 @@ namespace build2
       auto l (r[var]);
       return l.defined ()
         ? l
-        : lookup (r.assign (var), r); // NULL.
+        : lookup (r.assign (var), var, r); // NULL.
     }
 
     bool
diff --git a/build2/config/utility.txx b/build2/config/utility.txx
index fc21710..4336955 100644
--- a/build2/config/utility.txx
+++ b/build2/config/utility.txx
@@ -39,7 +39,7 @@ namespace build2
         v.extra = true; // Default value flag.
 
         n = (save_flags & save_commented) == 0; // Absence means default.
-        l = lookup (v, root);
+        l = lookup (v, var, root);
         org = make_pair (l, 1); // Lookup depth is 1 since it's in root.vars.
       }
       // Treat an inherited value that was set to default as new.
-- 
cgit v1.1