From 7e3092b83516e720ef367e8172421266078ee7e6 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 7 Aug 2019 08:27:11 +0200
Subject: Improve deadlock diagnostics (suppress stack trace, reword)

---
 libbuild2/scheduler.cxx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'libbuild2/scheduler.cxx')

diff --git a/libbuild2/scheduler.cxx b/libbuild2/scheduler.cxx
index b261a82..37220c7 100644
--- a/libbuild2/scheduler.cxx
+++ b/libbuild2/scheduler.cxx
@@ -20,7 +20,6 @@
 #endif
 
 #include <cerrno>
-#include <exception> // std::terminate()
 
 #include <libbuild2/diagnostics.hxx>
 
@@ -861,12 +860,12 @@ namespace build2
           // thing about abort is if this is not a dependency cycle, then we
           // have a core to examine).
           //
-          error << "detected deadlock that could be caused by a dependency "
-                << "cycle" <<
+          error << "deadlock detected, aborting" <<
+            info << "deadlocks are normally caused by dependency cycles" <<
             info << "re-run with -s to diagnose dependency cycles" <<
-            info << "if not a dependency cycle, please report";
+            info << "if not a dependency cycle, please report as a bug";
 
-          std::terminate ();
+          terminate (false /* trace */);
         }
       }
     }
-- 
cgit v1.1