From e94354ceef93f45b0a95f35eee62750876ec936b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 19 Mar 2021 15:38:34 +0200
Subject: Redo entering of src directories into scope_map

---
 libbuild2/algorithm.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libbuild2/algorithm.cxx')

diff --git a/libbuild2/algorithm.cxx b/libbuild2/algorithm.cxx
index 39df018..3f83ddd 100644
--- a/libbuild2/algorithm.cxx
+++ b/libbuild2/algorithm.cxx
@@ -1063,7 +1063,7 @@ namespace build2
     //
     const dir_path& d (parent && t.name.empty () ? t.dir.directory () : t.dir);
 
-    const scope& bs (t.ctx.scopes.find (d));
+    const scope& bs (t.ctx.scopes.find_out (d));
     const scope* rs (bs.root_scope ());
 
     // If root scope is NULL, then this can mean that we are out of any
@@ -1142,7 +1142,7 @@ namespace build2
 
       if (op_t != nullptr)
       {
-        op_s = &t.ctx.scopes.find (t.dir);
+        op_s = &t.ctx.scopes.find_out (t.dir); // Always out.
 
         if (op_s->out_path () == t.dir && !op_s->operation_callbacks.empty ())
         {
-- 
cgit v1.1