From 0342dc2fcdd78ef28a4e59d84193a3807068d726 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 11 Apr 2016 07:57:19 +0200
Subject: New configuration logic, iteration 1

---
 build2/parser.cxx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'build2/parser.cxx')

diff --git a/build2/parser.cxx b/build2/parser.cxx
index 6926ce3..2c21de3 100644
--- a/build2/parser.cxx
+++ b/build2/parser.cxx
@@ -2660,16 +2660,15 @@ namespace build2
       scope* nrs (&create_bootstrap_inner (*rs, out_base));
 
       if (rs != nrs)
-      {
-        load_root_pre (*nrs); // Load outer roots recursively.
         rs = nrs;
-      }
     }
 
     // Switch to the new root scope.
     //
     if (rs != root_)
     {
+      load_root_pre (*rs); // Load new root(s) recursively.
+
       l5 ([&]{trace << "switching to root scope " << rs->out_path ();});
       root_ = rs;
     }
-- 
cgit v1.1