stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8204664: PrepareFailureLogs should be done after sequential make targets

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2018-06-14 11:46:53 +02:00
parent d01224d43e
commit d51f7831cf
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/Init.gmk
View File

@ -298,7 +298,6 @@ else # HAS_SPEC=true
main: $(INIT_TARGETS) main: $(INIT_TARGETS)
ifneq ($(SEQUENTIAL_TARGETS)$(PARALLEL_TARGETS), ) ifneq ($(SEQUENTIAL_TARGETS)$(PARALLEL_TARGETS), )
$(call RotateLogFiles) $(call RotateLogFiles)
$(call PrepareFailureLogs)
$(PRINTF) "Building $(TARGET_DESCRIPTION)\n" $(BUILD_LOG_PIPE) $(PRINTF) "Building $(TARGET_DESCRIPTION)\n" $(BUILD_LOG_PIPE)
ifneq ($(SEQUENTIAL_TARGETS), ) ifneq ($(SEQUENTIAL_TARGETS), )
# Don't touch build output dir since we might be cleaning. That # Don't touch build output dir since we might be cleaning. That
@ -308,6 +307,7 @@ else # HAS_SPEC=true
$(SEQUENTIAL_TARGETS) ) $(SEQUENTIAL_TARGETS) )
endif endif
ifneq ($(PARALLEL_TARGETS), ) ifneq ($(PARALLEL_TARGETS), )
$(call PrepareFailureLogs)
$(call StartGlobalTimer) $(call StartGlobalTimer)
$(call PrepareSmartJavac) $(call PrepareSmartJavac)
# JOBS will only be empty for a bootcycle-images recursive call # JOBS will only be empty for a bootcycle-images recursive call

3
make/InitSupport.gmk
View File

@ -456,6 +456,9 @@ else # $(HAS_SPEC)=true
) )
endef 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 define PrepareFailureLogs
$(RM) -r $(MAKESUPPORT_OUTPUTDIR)/failure-logs 2> /dev/null && \ $(RM) -r $(MAKESUPPORT_OUTPUTDIR)/failure-logs 2> /dev/null && \
$(MKDIR) -p $(MAKESUPPORT_OUTPUTDIR)/failure-logs $(MKDIR) -p $(MAKESUPPORT_OUTPUTDIR)/failure-logs