aboutsummaryrefslogtreecommitdiff
path: root/build2/b.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-02-08 11:02:25 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-02-08 11:02:25 +0200
commit435b3e43dd054a716b3fc67fc34b43267f8e9809 (patch)
tree8e11ad74f0397feee9ffce064d3c6812c740a832 /build2/b.cxx
parent90d37f3fe126fa7b3d97fb071f537f910bd4a7fa (diff)
Enter scope src directories into scope map
Diffstat (limited to 'build2/b.cxx')
-rw-r--r--build2/b.cxx16
1 files changed, 9 insertions, 7 deletions
diff --git a/build2/b.cxx b/build2/b.cxx
index 9a924d6..ecf8c7f 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -1151,7 +1151,7 @@ main (int argc, char* argv[])
// use to the bootstrap files (other than src-root.build, which,
// BTW, doesn't need to exist if src_root == out_root).
//
- scope& rs (create_root (*ctx, out_root, src_root)->second);
+ scope& rs (*create_root (*ctx, out_root, src_root)->second.scope);
bool bstrapped (bootstrapped (rs));
@@ -1561,9 +1561,10 @@ main (int argc, char* argv[])
// If we have a directory, enter the scope, similar to how we do
// it in the context ctor.
//
- scope& s (o.dir
- ? sm.insert ((out_base / *o.dir).normalize ())->second
- : *rs.weak_scope ());
+ scope& s (
+ o.dir
+ ? *sm.insert ((out_base / *o.dir).normalize ())->second.scope
+ : *rs.weak_scope ());
auto p (s.vars.insert (o.ovr));
@@ -1581,9 +1582,10 @@ main (int argc, char* argv[])
if (o.ovr.visibility == variable_visibility::global)
continue;
- scope& s (o.dir
- ? sm.insert ((out_base / *o.dir).normalize ())->second
- : rs);
+ scope& s (
+ o.dir
+ ? *sm.insert ((out_base / *o.dir).normalize ())->second.scope
+ : rs);
auto p (s.vars.insert (o.ovr));