aboutsummaryrefslogtreecommitdiff
path: root/build2
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-07-12 09:58:44 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-07-12 09:58:44 +0200
commitec203677f1de13c200e54813db73a8ed5be8d4c9 (patch)
tree537f98ff676a6cbc7210e0a7d4fd3ba301882486 /build2
parentfc4bea587f91e503ab26d15b76ab1e3bf88672b1 (diff)
Cache subprojects variable value in scope::root_extra
Diffstat (limited to 'build2')
-rw-r--r--build2/b.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/build2/b.cxx b/build2/b.cxx
index 61cb931..4e9ebf7 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -1103,9 +1103,9 @@ main (int argc, char* argv[])
// Note that the subprojects variable has already been processed
// and converted to a map by the bootstrap_src() call above.
//
- if (auto l = rs.vars[ctx->var_subprojects])
+ if (const subprojects* ps = *rs.root_extra->subprojects)
{
- for (const auto& p: cast<subprojects> (l))
+ for (const auto& p: *ps)
{
if (out_base.sub (out_root / p.second))
fail << tn << " is in a subproject of " << out_root <<