Print --debug={tree,dtree,includes} even if the build has an error.

1 files changed, 16 insertions, 0 deletions

diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py
index 6bd5e21..b528f44 100644
--- a/src/engine/SCons/Taskmaster.py
+++ b/src/engine/SCons/Taskmaster.py
@@ -152,8 +152,16 @@ class Task:
         for t in self.targets:
             t.set_state(SCons.Node.failed)
         self.tm.failed(self.node)
+        next_top = self.tm.next_top_level_candidate()
         self.tm.stop()
 
+        if next_top:
+            # We're stopping because of a build failure, but give the
+            # calling Task class a chance to postprocess() the top-level
+            # target under which the build failure occurred.
+            self.targets = [next_top]
+            self.top = 1
+
     def fail_continue(self):
         """Explicit continue-the-build failure.
 
@@ -426,6 +434,14 @@ class Taskmaster:
 
         return not self.ready and (self.pending or self.executing)
 
+    def next_top_level_candidate(self):
+        candidates = self.candidates[:]
+        candidates.reverse()
+        for c in candidates:
+            if c in self.targets:
+                return c
+        return None
+
     def stop(self):
         """Stop the current build completely."""
         self.candidates = []