changeset 43917:18750661e660

8175271: Race in GenerateLinkOptData.gmk Reviewed-by: redestad, ihse
author erikj
date Tue, 21 Feb 2017 13:47:27 +0100
parents 35fe9d6f5075
children 6d31a727d6c1
files make/GenerateLinkOptData.gmk
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/GenerateLinkOptData.gmk	Fri Feb 17 18:12:53 2017 +0100
+++ b/make/GenerateLinkOptData.gmk	Tue Feb 21 13:47:27 2017 +0100
@@ -69,7 +69,7 @@
 
 # The jli trace is created by the same recipe as classlist. By declaring these
 # dependencies, make will correctly rebuild both jli trace and classlist
-# incrementally using the single recpie above.
+# incrementally using the single recipe above.
 $(CLASSLIST_FILE): $(JLI_TRACE_FILE)
 $(JLI_TRACE_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR)
 
@@ -89,6 +89,11 @@
     DEST := $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jlink/internal/plugins, \
 ))
 
+# Because of the single recipe for jli trace and classlist above, the
+# COPY_JLI_TRACE rule needs to explicitly add the classlist file as a
+# prerequisite.
+$(COPY_JLI_TRACE): $(CLASSLIST_FILE)
+
 TARGETS += $(COPY_JLI_TRACE)
 
 ################################################################################