File bootcycle.patch of Package java-17-openj9
--- a/closed/OpenJ9.gmk
+++ b/closed/OpenJ9.gmk
@@ -252,7 +252,7 @@ CMAKE_ARGS := \
-C $(OPENJ9_TOPDIR)/runtime/cmake/caches/$(patsubst %_cross,%,$(OPENJ9_BUILDSPEC)).cmake \
-DBOOT_JDK="$(BOOT_JDK)" \
-DBUILD_ID=$(BUILD_ID) \
- -DCMAKE_TOOLCHAIN_FILE="$(OUTPUTDIR)/toolchain.cmake" \
+ -DCMAKE_TOOLCHAIN_FILE="$(TOOLCHAIN_CMAKE_FILE)" \
-DJ9VM_OMR_DIR="$(OPENJ9OMR_TOPDIR)" \
-DJAVA_SPEC_VERSION=$(VERSION_FEATURE) \
-DOMR_DDR=$(OPENJ9_ENABLE_DDR) \
--- a/make/autoconf/bootcycle-spec.gmk.in
+++ b/make/autoconf/bootcycle-spec.gmk.in
@@ -49,3 +49,4 @@ JAVA_FLAGS_BIG := @BOOTCYCLE_JVM_ARGS_BIG@
# settings for CDS.
JAVA_FLAGS := $(filter-out -XX:SharedArchiveFile% -Xshare%, $(JAVA_FLAGS))
+TOOLCHAIN_CMAKE_FILE := $(OLD_OUTPUTDIR)/toolchain.cmake
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index 807ba27589b..6906f7cf735 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -966,5 +966,7 @@ JCOV_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JCOV_BUNDLE_NAME)
define IncludeCustomExtension
endef
+TOOLCHAIN_CMAKE_FILE := $(OUTPUTDIR)/toolchain.cmake
+
# Include the custom-spec.gmk file if it exists
-include $(dir @SPEC@)/custom-spec.gmk