aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/config
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/config
parent14b8aa90926bdc7233caa926d81984c6593e1f76 (diff)
Redo entering of src directories into scope_map
Diffstat (limited to 'libbuild2/config')
-rw-r--r--libbuild2/config/operation.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/libbuild2/config/operation.cxx b/libbuild2/config/operation.cxx
index 7490bc3..d30de4d 100644
--- a/libbuild2/config/operation.cxx
+++ b/libbuild2/config/operation.cxx
@@ -609,7 +609,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));
// @@ Strictly speaking we need to check whether the config module
// was loaded for this subproject.
@@ -649,7 +649,7 @@ namespace build2
for (auto p: *ps)
{
dir_path out_nroot (out_root / p.second);
- const scope& nrs (ctx.scopes.find (out_nroot));
+ const scope& nrs (ctx.scopes.find_out (out_nroot));
assert (nrs.out_path () == out_nroot);
configure_forward (nrs, projects);
@@ -877,7 +877,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));
assert (nrs.out_path () == out_nroot); // See disfigure_load().
r = disfigure_project (a, nrs, projects) || r;
@@ -985,7 +985,7 @@ namespace build2
for (auto p: *ps)
{
dir_path out_nroot (out_root / p.second);
- const scope& nrs (ctx.scopes.find (out_nroot));
+ const scope& nrs (ctx.scopes.find_out (out_nroot));
assert (nrs.out_path () == out_nroot);
r = disfigure_forward (nrs, projects) || r;