8081858: make dist-clean does not delete all log files

Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2018-09-10 09:59:27 +02:00
parent 6b2d1c9834
commit db72e03e12
2 changed files with 7 additions and 1 deletions

View File

@ -240,6 +240,11 @@ else # HAS_SPEC=true
override BUILD_LOG_PIPE :=
endif
ifeq ($(filter dist-clean, $(SEQUENTIAL_TARGETS)), dist-clean)
# We can't have a log file if we're about to remove it.
override BUILD_LOG_PIPE :=
endif
ifeq ($(OUTPUT_SYNC_SUPPORTED), true)
OUTPUT_SYNC_FLAG := -O$(OUTPUT_SYNC)
endif

View File

@ -1107,7 +1107,8 @@ clean-test: clean-test-results clean-test-support
# directory was created by configure and now becomes empty, remove it as well.
dist-clean: clean
($(CD) $(OUTPUTDIR) && \
$(RM) -r *spec.gmk $(CONFIGURESUPPORT_OUTPUTDIR) Makefile compare.sh ide)
$(RM) -r *spec.gmk $(CONFIGURESUPPORT_OUTPUTDIR) Makefile compare.sh ide \
configure.log* build.log*)
$(if $(filter $(CONF_NAME),$(notdir $(OUTPUTDIR))), \
if test "x`$(LS) $(OUTPUTDIR)`" != x; then \
$(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \