From ab6917b035a8431a13d85396ed15b75dabe44b36 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 24 Apr 2020 15:11:51 +0200
Subject: Don't switch projects when switching scopes during bootstrap

---
 libbuild2/config/init.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libbuild2/config/init.cxx')

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)
-- 
cgit v1.1