diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2021-05-24 10:50:28 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2021-05-28 10:10:44 +0200 |
| commit | 726aaab07a785b904dd1265bffa603bdd2a7665b (patch) | |
| tree | ec28756d501ef3411b02a10a24dde76535e6581c /libbuild2/target.cxx | |
| parent | e1f472e471533330db05a42d5bcd4e99b211da0c (diff) | |
Tie loose ends in target type/pattern-specific matching
Diffstat (limited to 'libbuild2/target.cxx')
| -rw-r--r-- | libbuild2/target.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
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; |