aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/bin
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-01-28 08:41:57 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-01-28 08:41:57 +0200
commitccb417a7c1456427b76914e8a11ca87b4926eeb3 (patch)
treed68803a1a1a013b1bb50f845459d0145c221eb79 /libbuild2/bin
parentc0105aad0074aee0efb3ba41f8132496412f8790 (diff)
Use scope::var_pool()
Diffstat (limited to 'libbuild2/bin')
-rw-r--r--libbuild2/bin/init.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/libbuild2/bin/init.cxx b/libbuild2/bin/init.cxx
index a4d51e5..2bb96e8 100644
--- a/libbuild2/bin/init.cxx
+++ b/libbuild2/bin/init.cxx
@@ -57,7 +57,7 @@ namespace build2
// Target is a string and not target_triplet because it can be
// specified by the user.
//
- auto& vp (rs.ctx.var_pool.rw (rs));
+ auto& vp (rs.var_pool ());
const auto vis_tgt (variable_visibility::target);
const auto vis_prj (variable_visibility::project);
@@ -583,13 +583,13 @@ namespace build2
//
if (first)
{
- auto& v (rs.ctx.var_pool.rw (rs));
+ auto& vp (rs.var_pool ());
- v.insert<process_path> ("bin.ar.path");
- v.insert<process_path> ("bin.ranlib.path");
+ vp.insert<process_path> ("bin.ar.path");
+ vp.insert<process_path> ("bin.ranlib.path");
- v.insert<path> ("config.bin.ar", true);
- v.insert<path> ("config.bin.ranlib", true);
+ vp.insert<path> ("config.bin.ar", true);
+ vp.insert<path> ("config.bin.ranlib", true);
}
// Configure.
@@ -751,10 +751,10 @@ namespace build2
//
if (first)
{
- auto& v (rs.ctx.var_pool.rw (rs));
+ auto& vp (rs.var_pool ());
- v.insert<process_path> ("bin.ld.path");
- v.insert<path> ("config.bin.ld", true);
+ vp.insert<process_path> ("bin.ld.path");
+ vp.insert<path> ("config.bin.ld", true);
}
// Configure.
@@ -857,10 +857,10 @@ namespace build2
//
if (first)
{
- auto& v (rs.ctx.var_pool.rw (rs));
+ auto& vp (rs.var_pool ());
- v.insert<process_path> ("bin.rc.path");
- v.insert<path> ("config.bin.rc", true);
+ vp.insert<process_path> ("bin.rc.path");
+ vp.insert<path> ("config.bin.rc", true);
}
// Configure.