changeset 52175:c2672a0f233a

8212201: Classlist build tool should be built for the target JDK version Reviewed-by: erikj, ihse
author redestad
date Wed, 17 Oct 2018 14:19:21 +0200
parents 8f93292c2a51
children cba34f27d9ce
files make/CompileToolsJdk.gmk make/GenerateLinkOptData.gmk
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/CompileToolsJdk.gmk	Wed Oct 17 15:28:36 2018 +0530
+++ b/make/CompileToolsJdk.gmk	Wed Oct 17 14:19:21 2018 +0200
@@ -46,6 +46,7 @@
     SETUP := GENERATE_OLDBYTECODE, \
     SRC := $(BUILD_TOOLS_SRC_DIRS), \
     EXCLUDES := \
+        build/tools/classlist \
         build/tools/deps \
         build/tools/docs \
         build/tools/jigsaw \
--- a/make/GenerateLinkOptData.gmk	Wed Oct 17 15:28:36 2018 +0530
+++ b/make/GenerateLinkOptData.gmk	Wed Oct 17 14:19:21 2018 +0200
@@ -31,15 +31,17 @@
 
 include $(SPEC)
 include MakeBase.gmk
-include JarArchive.gmk
+include SetupJavaCompilers.gmk
 
 ################################################################################
 # Create a jar with our generator class. Using a jar is intentional since it
 # will load more classes
 
-$(eval $(call SetupJarArchive, CLASSLIST_JAR, \
-    SRCS := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
+$(eval $(call SetupJavaCompilation, CLASSLIST_JAR, \
+    SETUP := GENERATE_JDKBYTECODE, \
+    SRC := $(TOPDIR)/make/jdk/src/classes, \
     INCLUDES := build/tools/classlist, \
+    BIN := $(BUILDTOOLS_OUTPUTDIR)/classlist_classes, \
     JAR := $(SUPPORT_OUTPUTDIR)/classlist.jar, \
 ))