From 726aaab07a785b904dd1265bffa603bdd2a7665b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 24 May 2021 10:50:28 +0200
Subject: Tie loose ends in target type/pattern-specific matching

---
 libbuild2/target.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'libbuild2/target.cxx')

diff --git a/libbuild2/target.cxx b/libbuild2/target.cxx
index 6ba12b9..a686fc2 100644
--- a/libbuild2/target.cxx
+++ b/libbuild2/target.cxx
@@ -182,13 +182,13 @@ namespace build2
     {
       if (!target_only)
       {
-        //@@ TODO: dir name
+        target_key tk (key ());
+        target_key gk (g != nullptr ? g->key () : target_key {});
+
         auto p (base_scope ().lookup_original (
                   var,
-                  &type (),
-                  &name,
-                  g != nullptr ? &g->type () : nullptr,
-                  g != nullptr ? &g->name : nullptr));
+                  &tk,
+                  g != nullptr ? &gk : nullptr));
 
         r.first = move (p.first);
         r.second = r.first ? r.second + p.second : p.second;
-- 
cgit v1.1