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/dist/operation.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libbuild2/dist') diff --git a/libbuild2/dist/operation.cxx b/libbuild2/dist/operation.cxx index ac76a62..f04a809 100644 --- a/libbuild2/dist/operation.cxx +++ b/libbuild2/dist/operation.cxx @@ -309,7 +309,7 @@ namespace build2 { const dir_path& pd (p.second); dir_path out_nroot (out_root / pd); - const scope& nrs (ctx.scopes.find (out_nroot)); + const scope& nrs (ctx.scopes.find_out (out_nroot)); if (nrs.out_path () != out_nroot) // This subproject not loaded. continue; @@ -470,7 +470,7 @@ namespace build2 const dir_path& pd (p.second); if (dl.sub (pd)) { - srs = &ctx.scopes.find (out_root / pd); + srs = &ctx.scopes.find_out (out_root / pd); if (auto* m = srs->find_module (module::name)) cbs = &m->callbacks_; @@ -1008,7 +1008,9 @@ namespace build2 if (rs.out_path () != out_base || rs.src_path () != src_base) fail (l) << "dist meta-operation target must be project root directory"; - setup_base (rs.ctx.scopes.rw (rs).insert (out_base), out_base, src_base); + setup_base (rs.ctx.scopes.rw (rs).insert_out (out_base), + out_base, + src_base); // Also initialize the dist.* variables (needed in dist_project()). // -- cgit v1.1