8175271: Race in GenerateLinkOptData.gmk
Reviewed-by: redestad, ihse
This commit is contained in:
parent
ada23c9fef
commit
cf801acb71
@ -69,7 +69,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR)
|
||||
|
||||
# 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 @@ $(eval $(call SetupCopyFiles, COPY_JLI_TRACE, \
|
||||
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)
|
||||
|
||||
################################################################################
|
||||
|
Loading…
Reference in New Issue
Block a user