aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-08-26 14:48:34 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-08-26 14:48:34 +0200
commit49e9668faaf77280b458928da963167a29335c3a (patch)
tree61eaeab0ba5c0bfc4e58ac7d2134c19583db05e9
parent0ccdb079856c9dc363dc588effb2a3b2f728ba41 (diff)
Fix bug in scope::find_target_key()
-rw-r--r--libbuild2/scope.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/libbuild2/scope.cxx b/libbuild2/scope.cxx
index 0b9d981..d6251a4 100644
--- a/libbuild2/scope.cxx
+++ b/libbuild2/scope.cxx
@@ -781,7 +781,14 @@ namespace build2
if (n == (ns[0].pair ? 2 : 1))
{
name dummy;
- return find_target_key (ns[0], n == 2 ? ns[1] : dummy, loc);
+ target_key r (find_target_key (ns[0], n == 1 ? dummy : ns[1], loc));
+
+ return target_key {
+ r.type,
+ r.dir,
+ n == 1 ? &empty_dir_path : r.out,
+ r.name,
+ move (r.ext)};
}
}