--- old/make/Init.gmk	2016-09-02 14:12:22.641233845 +0200
+++ new/make/Init.gmk	2016-09-02 14:12:22.557230334 +0200
@@ -314,6 +314,9 @@
         endif
 
     on-failure:
+	$(call CleanupSmartJavac)
+	$(call StopGlobalTimer)
+	$(call ReportBuildTimes)
 	$(call PrintFailureReports)
 	$(call PrintBuildLogFailures)
 	$(PRINTF) "Hint: If caused by a warning, try configure --disable-warnings-as-errors.\n\n"