From f93038fbee1631b95922b0742e0fd00fa8dae02e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 27 Jan 2017 15:25:26 +0200
Subject: Add notion of phase, enforce

---
 build2/file.cxx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'build2/file.cxx')

diff --git a/build2/file.cxx b/build2/file.cxx
index 9440738..72d2807 100644
--- a/build2/file.cxx
+++ b/build2/file.cxx
@@ -892,6 +892,8 @@ namespace build2
     // over anything that we may discover. In particular, we will prefer it
     // over any bundled subprojects.
     //
+    auto& vp (var_pool.rw (iroot));
+
     for (;;) // Break-out loop.
     {
       string n ("config.import." + proj);
@@ -901,8 +903,7 @@ namespace build2
       // Note: overridable variable with path auto-completion.
       //
       {
-        const variable& var (
-          var_pool.rw (ibase).insert<abs_dir_path> (n, true));
+        const variable& var (vp.insert<abs_dir_path> (n, true));
 
         if (auto l = iroot[var])
         {
@@ -931,9 +932,9 @@ namespace build2
       //
       if (!target.value.empty ())
       {
-        auto lookup = [&iroot, &loc] (string name) -> path
+        auto lookup = [&iroot, &vp, &loc] (string name) -> path
         {
-          const variable& var (var_pool.rw (iroot).insert<path> (name, true));
+          const variable& var (vp.insert<path> (name, true));
 
           path r;
           if (auto l = iroot[var])
-- 
cgit v1.1