From b1c0737ad56c2d9f5127531a8696ad304584f1e0 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Wed, 17 Oct 2018 14:19:21 +0200
Subject: [PATCH] 8212201: Classlist build tool should be built for the target
 JDK version

Reviewed-by: erikj, ihse
---
 make/CompileToolsJdk.gmk     | 1 +
 make/GenerateLinkOptData.gmk | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/make/CompileToolsJdk.gmk b/make/CompileToolsJdk.gmk
index 14966405ed1..cd4034d51f6 100644
--- a/make/CompileToolsJdk.gmk
+++ b/make/CompileToolsJdk.gmk
@@ -46,6 +46,7 @@ $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
     SETUP := GENERATE_OLDBYTECODE, \
     SRC := $(BUILD_TOOLS_SRC_DIRS), \
     EXCLUDES := \
+        build/tools/classlist \
         build/tools/deps \
         build/tools/docs \
         build/tools/jigsaw \
diff --git a/make/GenerateLinkOptData.gmk b/make/GenerateLinkOptData.gmk
index 7358589e6f3..cd7db160cd3 100644
--- a/make/GenerateLinkOptData.gmk
+++ b/make/GenerateLinkOptData.gmk
@@ -31,15 +31,17 @@ default: all
 
 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, \
 ))