8212201: Classlist build tool should be built for the target JDK version

Reviewed-by: erikj, ihse
This commit is contained in:
Claes Redestad 2018-10-17 14:19:21 +02:00
parent 4e1c510215
commit b1c0737ad5
2 changed files with 6 additions and 3 deletions

View File

@ -46,6 +46,7 @@ $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
SETUP := GENERATE_OLDBYTECODE, \ SETUP := GENERATE_OLDBYTECODE, \
SRC := $(BUILD_TOOLS_SRC_DIRS), \ SRC := $(BUILD_TOOLS_SRC_DIRS), \
EXCLUDES := \ EXCLUDES := \
build/tools/classlist \
build/tools/deps \ build/tools/deps \
build/tools/docs \ build/tools/docs \
build/tools/jigsaw \ build/tools/jigsaw \

View File

@ -31,15 +31,17 @@ default: all
include $(SPEC) include $(SPEC)
include MakeBase.gmk include MakeBase.gmk
include JarArchive.gmk include SetupJavaCompilers.gmk
################################################################################ ################################################################################
# Create a jar with our generator class. Using a jar is intentional since it # Create a jar with our generator class. Using a jar is intentional since it
# will load more classes # will load more classes
$(eval $(call SetupJarArchive, CLASSLIST_JAR, \ $(eval $(call SetupJavaCompilation, CLASSLIST_JAR, \
SRCS := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \ SETUP := GENERATE_JDKBYTECODE, \
SRC := $(TOPDIR)/make/jdk/src/classes, \
INCLUDES := build/tools/classlist, \ INCLUDES := build/tools/classlist, \
BIN := $(BUILDTOOLS_OUTPUTDIR)/classlist_classes, \
JAR := $(SUPPORT_OUTPUTDIR)/classlist.jar, \ JAR := $(SUPPORT_OUTPUTDIR)/classlist.jar, \
)) ))