8154430: Imported modules rebuilt on second run when nothing has changed

Reviewed-by: alanb, tbell
This commit is contained in:
Erik Joelsson 2016-04-18 17:18:41 +02:00
parent 9bb620e369
commit 192d906e65

View File

@ -542,8 +542,9 @@ endif
ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), ) ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
$(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \ $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \
$(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE)) $(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE))
$(RM) -r $(@D) $(call MakeDir, $(@D))
$(MKDIR) -p $(@D) # Do not delete marker and build meta data files
$(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*))
$(CP) -R $(IMPORT_MODULES_CLASSES)/$(MODULE)/* $(@D)/ $(CP) -R $(IMPORT_MODULES_CLASSES)/$(MODULE)/* $(@D)/
$(TOUCH) $@ $(TOUCH) $@