diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2021-03-19 15:38:34 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2021-03-19 15:38:34 +0200 |
| commit | e94354ceef93f45b0a95f35eee62750876ec936b (patch) | |
| tree | 11b454f999e4d7b873eb9be772a7c014fc522e00 /libbuild2/dist | |
| parent | 14b8aa90926bdc7233caa926d81984c6593e1f76 (diff) | |
Redo entering of src directories into scope_map
Diffstat (limited to 'libbuild2/dist')
| -rw-r--r-- | libbuild2/dist/operation.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
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> (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()). // |