diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-04-11 07:57:19 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-04-11 07:57:19 +0200 |
| commit | 0342dc2fcdd78ef28a4e59d84193a3807068d726 (patch) | |
| tree | e750c3062d6ff54f0d409fe1a25984b7e78592c8 /build2/parser.cxx | |
| parent | 5f7c3f923de106f9d204a8f3500274731ae84fd9 (diff) | |
New configuration logic, iteration 1
Diffstat (limited to 'build2/parser.cxx')
| -rw-r--r-- | build2/parser.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
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; } |