aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/context.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-03-19 15:38:34 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-03-19 15:38:34 +0200
commite94354ceef93f45b0a95f35eee62750876ec936b (patch)
tree11b454f999e4d7b873eb9be772a7c014fc522e00 /libbuild2/context.cxx
parent14b8aa90926bdc7233caa926d81984c6593e1f76 (diff)
Redo entering of src directories into scope_map
Diffstat (limited to 'libbuild2/context.cxx')
-rw-r--r--libbuild2/context.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/libbuild2/context.cxx b/libbuild2/context.cxx
index e8f671d..09ab15d 100644
--- a/libbuild2/context.cxx
+++ b/libbuild2/context.cxx
@@ -34,8 +34,8 @@ namespace build2
static inline scope&
create_global_scope (scope_map& m)
{
- auto i (m.insert (dir_path ()));
- scope& r (*i->second.scope);
+ auto i (m.insert_out (dir_path ()));
+ scope& r (*i->second.front ());
r.out_path_ = &i->first;
return r;
};
@@ -490,7 +490,7 @@ namespace build2
//
if (c == '!' || (dir && dir->absolute ()))
{
- scope& s (c == '!' ? gs : *sm.insert (*dir)->second.scope);
+ scope& s (c == '!' ? gs : *sm.insert_out (*dir)->second.front ());
auto p (s.vars.insert (*o));
assert (p.second); // Variable name is unique.