changeset 2034:09617ce980b9 jdk-9+115

8154430: Imported modules rebuilt on second run when nothing has changed Reviewed-by: alanb, tbell
author erikj
date Mon, 18 Apr 2016 17:18:41 +0200
parents 5aab06744c09
children ed0c0482b97f 28438b6fbaa1 5165182f2d88 c6b64d18affc
files make/CompileJavaModules.gmk
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk	Mon Apr 18 09:12:44 2016 +0200
+++ b/make/CompileJavaModules.gmk	Mon Apr 18 17:18:41 2016 +0200
@@ -542,8 +542,9 @@
 ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
   $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \
       $(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE))
-	$(RM) -r $(@D)
-	$(MKDIR) -p $(@D)
+	$(call MakeDir, $(@D))
+        # Do not delete marker and build meta data files
+	$(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*))
 	$(CP) -R $(IMPORT_MODULES_CLASSES)/$(MODULE)/* $(@D)/
 	$(TOUCH) $@