diff -r 9379643900c6 -r e46434c65a2b make/GenerateLinkOptData.gmk --- a/make/GenerateLinkOptData.gmk Thu Mar 16 20:47:03 2017 +0000 +++ b/make/GenerateLinkOptData.gmk Wed Jul 05 23:01:50 2017 +0200 @@ -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) ################################################################################