Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8154430: Imported modules rebuilt on second run when nothing has changed
authorerikj
Mon, 18 Apr 2016 17:18:41 +0200
changeset 37037 4fbd14764fa7
parent 37036 9ee61185a43c
child 37302 cf820d974c75
8154430: Imported modules rebuilt on second run when nothing has changed Reviewed-by: alanb, tbell
make/CompileJavaModules.gmk file | annotate | diff | comparison | revisions 
--- 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) $@
jdk-sandbox