# HG changeset patch
# User ihse
# Date 1528969613 -7200
# Node ID 3903ab54107e38f7855a08d7bc86e6aa5cf40227
# Parent  5756e8eecb175f6ed4f8406ec27ac4a3ed6e34d8
8204664: PrepareFailureLogs should be done after sequential make targets
Reviewed-by: erikj

diff -r 5756e8eecb17 -r 3903ab54107e make/Init.gmk
--- a/make/Init.gmk	Thu Jun 14 11:22:04 2018 +0200
+++ b/make/Init.gmk	Thu Jun 14 11:46:53 2018 +0200
@@ -298,7 +298,6 @@
   main: $(INIT_TARGETS)
         ifneq ($(SEQUENTIAL_TARGETS)$(PARALLEL_TARGETS), )
 	  $(call RotateLogFiles)
-	  $(call PrepareFailureLogs)
 	  $(PRINTF) "Building $(TARGET_DESCRIPTION)\n" $(BUILD_LOG_PIPE)
           ifneq ($(SEQUENTIAL_TARGETS), )
             # Don't touch build output dir since we might be cleaning. That
@@ -308,6 +307,7 @@
 	        $(SEQUENTIAL_TARGETS) )
           endif
           ifneq ($(PARALLEL_TARGETS), )
+	    $(call PrepareFailureLogs)
 	    $(call StartGlobalTimer)
 	    $(call PrepareSmartJavac)
             # JOBS will only be empty for a bootcycle-images recursive call
diff -r 5756e8eecb17 -r 3903ab54107e make/InitSupport.gmk
--- a/make/InitSupport.gmk	Thu Jun 14 11:22:04 2018 +0200
+++ b/make/InitSupport.gmk	Thu Jun 14 11:46:53 2018 +0200
@@ -456,6 +456,9 @@
 	)
   endef
 
+  # Failure logs are only supported for "parallel" main targets, not the
+  # (trivial) sequential make targets (such as clean and reconfigure),
+  # since the failure-logs directory creation will conflict with clean.
   define PrepareFailureLogs
 	$(RM) -r $(MAKESUPPORT_OUTPUTDIR)/failure-logs 2> /dev/null && \
 	$(MKDIR) -p $(MAKESUPPORT_OUTPUTDIR)/failure-logs