File bootcycle.patch of Package java-11-openj9
--- a/closed/OpenJ9.gmk +++ b/closed/OpenJ9.gmk @@ -251,7 +251,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 @@ -60,3 +60,5 @@ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) endif # The bootcycle JVM arguments may differ from the original boot jdk. JAVA_FLAGS_BIG := @BOOTCYCLE_JVM_ARGS_BIG@ + +TOOLCHAIN_CMAKE_FILE := $(OLD_OUTPUTDIR)/toolchain.cmake --- a/make/autoconf/spec.gmk.in +++ b/make/autoconf/spec.gmk.in @@ -965,5 +965,7 @@ DOCS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_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