OpenJDK / jdk / jdk12
changeset 51678:2fdfe34f7262
8081858: make dist-clean does not delete all log files
Reviewed-by: erikj
| author | ihse |
|---|---|
| date | Mon, 10 Sep 2018 09:59:27 +0200 |
| parents | ddc976897c75 |
| children | f7563db3ae1b |
| files | make/Init.gmk make/Main.gmk |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Init.gmk Mon Sep 10 09:58:23 2018 +0200 +++ b/make/Init.gmk Mon Sep 10 09:59:27 2018 +0200 @@ -240,6 +240,11 @@ 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
--- a/make/Main.gmk Mon Sep 10 09:58:23 2018 +0200 +++ b/make/Main.gmk Mon Sep 10 09:59:27 2018 +0200 @@ -1107,7 +1107,8 @@ # 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)'" ; \