From 5035f4ef68922ac758b1e4734e67d73c9228010b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 22 Aug 2019 14:38:57 +0200
Subject: Introduce notion of build context

All non-const global state is now in class context and we can now have
multiple independent builds going on at the same time.
---
 build2/bin/init.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'build2/bin/init.cxx')

diff --git a/build2/bin/init.cxx b/build2/bin/init.cxx
index b46d643..4e80834 100644
--- a/build2/bin/init.cxx
+++ b/build2/bin/init.cxx
@@ -56,7 +56,7 @@ namespace build2
       // Target is a string and not target_triplet because it can be
       // specified by the user.
       //
-      auto& vp (var_pool.rw (rs));
+      auto& vp (rs.ctx.var_pool.rw (rs));
 
       vp.insert<string>    ("config.bin.target",   true);
       vp.insert<string>    ("config.bin.pattern",  true);
@@ -266,7 +266,7 @@ namespace build2
         // config.bin.target
         //
         {
-          const variable& var (var_pool["config.bin.target"]);
+          const variable& var (rs.ctx.var_pool["config.bin.target"]);
 
           // We first see if the value was specified via the configuration
           // mechanism.
@@ -343,7 +343,7 @@ namespace build2
         // config.bin.pattern
         //
         {
-          const variable& var (var_pool["config.bin.pattern"]);
+          const variable& var (rs.ctx.var_pool["config.bin.pattern"]);
 
           // We first see if the value was specified via the configuration
           // mechanism.
@@ -568,7 +568,7 @@ namespace build2
       //
       if (first)
       {
-        auto& v (var_pool.rw (rs));
+        auto& v (rs.ctx.var_pool.rw (rs));
 
         v.insert<process_path> ("bin.ar.path");
         v.insert<process_path> ("bin.ranlib.path");
@@ -744,7 +744,7 @@ namespace build2
       //
       if (first)
       {
-        auto& v (var_pool.rw (rs));
+        auto& v (rs.ctx.var_pool.rw (rs));
 
         v.insert<process_path> ("bin.ld.path");
         v.insert<path>         ("config.bin.ld", true);
@@ -857,7 +857,7 @@ namespace build2
       //
       if (first)
       {
-        auto& v (var_pool.rw (rs));
+        auto& v (rs.ctx.var_pool.rw (rs));
 
         v.insert<process_path> ("bin.rc.path");
         v.insert<path>         ("config.bin.rc", true);
-- 
cgit v1.1