aboutsummaryrefslogtreecommitdiff
path: root/build2
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-03-24 16:34:54 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-03-24 16:34:54 +0200
commit1271630db189e60610eeae2c2a7dc72edd91afde (patch)
tree2505e839d19388d29c395a136180ef4c9a5f4911 /build2
parent9ff6adf13f4176230e39685b9035f176360f712f (diff)
Fix recursive locking bug
Diffstat (limited to 'build2')
-rw-r--r--build2/target.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/build2/target.cxx b/build2/target.cxx
index 81d0e4b..3adfc66 100644
--- a/build2/target.cxx
+++ b/build2/target.cxx
@@ -298,7 +298,9 @@ namespace build2
l5 ([&]{
diag_record r (trace);
r << "assuming target ";
- to_stream (r.os, t.key (), 0); // Don't print the extension.
+ to_stream (r.os,
+ target_key {&t.type (), &t.dir, &t.out, &t.name, nullopt},
+ 0); // Don't print the extension.
r << " is the same as the one with ";
if (!k.ext)
@@ -372,7 +374,10 @@ namespace build2
l5 ([&]{
diag_record r (trace);
r << "assuming target ";
- to_stream (r.os, t->key (), 0); // Don't print the extension.
+ to_stream (
+ r.os,
+ target_key {&t->type (), &t->dir, &t->out, &t->name, nullopt},
+ 0); // Don't print the extension.
r << " is the same as the one with ";
if (!te.second)