aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/config/init.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-04-24 15:11:51 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-04-27 09:24:41 +0200
commitab6917b035a8431a13d85396ed15b75dabe44b36 (patch)
tree31622edcf0f0f46be4f88de41e2da0c8ecb85eaf /libbuild2/config/init.cxx
parentab93dccd5806de95b9123ec6c2272847ca0ae592 (diff)
Don't switch projects when switching scopes during bootstrap
Diffstat (limited to 'libbuild2/config/init.cxx')
-rw-r--r--libbuild2/config/init.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/libbuild2/config/init.cxx b/libbuild2/config/init.cxx
index f0f4841..aa2c763 100644
--- a/libbuild2/config/init.cxx
+++ b/libbuild2/config/init.cxx
@@ -215,7 +215,10 @@ namespace build2
info << "consider reconfiguring " << project (rs) << '@'
<< rs.out_path ();
- source (rs, rs, lex);
+ // Treat it as continuation of bootstrap to avoid project switching
+ // (see switch_scope() for details).
+ //
+ source (rs, rs, lex, load_stage::boot);
};
auto load_config_file = [&load_config] (const path& f, const location& l)