From 0f0c5b2d71e6dec442a5105ba305043cb59b99fc Mon Sep 17 00:00:00 2001
From: Andrew Leonard <aleonard@openjdk.org>
Date: Mon, 25 Sep 2023 08:35:53 +0000
Subject: [PATCH] 8316648: jrt-fs.jar classes not reproducible between standard
 and bootcycle builds

Reviewed-by: erikj
---
 make/JrtfsJar.gmk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/make/JrtfsJar.gmk b/make/JrtfsJar.gmk
index 278b7657a82..50ae82ca565 100644
--- a/make/JrtfsJar.gmk
+++ b/make/JrtfsJar.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -46,8 +46,10 @@ JIMAGE_PKGS := \
     jdk/internal/jrtfs \
     #
 
+# Compile jrt-fs.jar with the interim compiler, as it
+# ends up in the image, this will ensure reproducible classes
 $(eval $(call SetupJavaCompilation, BUILD_JRTFS, \
-    COMPILER := bootjdk, \
+    COMPILER := interim, \
     DISABLED_WARNINGS := options, \
     TARGET_RELEASE := $(TARGET_RELEASE_JDK8), \
     SRC := $(TOPDIR)/src/java.base/share/classes, \