From e94354ceef93f45b0a95f35eee62750876ec936b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 19 Mar 2021 15:38:34 +0200 Subject: Redo entering of src directories into scope_map --- libbuild2/context.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libbuild2/context.cxx') 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. -- cgit v1.1