From 1271630db189e60610eeae2c2a7dc72edd91afde Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 24 Mar 2017 16:34:54 +0200
Subject: Fix recursive locking bug

---
 build2/target.cxx | 9 +++++++--
 1 file 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)
-- 
cgit v1.1