From c0807ba3f088b8c09207577e84d022bacf5aa810 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Sat, 3 Feb 2024 17:59:44 +0100 Subject: [PATCH] Special case boot version for JDK11u on riscv64 (#3629) --- build-farm/make-adopt-build-farm.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-farm/make-adopt-build-farm.sh b/build-farm/make-adopt-build-farm.sh index bd406bf23..763125175 100755 --- a/build-farm/make-adopt-build-farm.sh +++ b/build-farm/make-adopt-build-farm.sh @@ -142,8 +142,10 @@ then if [ "${JAVA_FEATURE_VERSION}" == "11" ] && [ "${VARIANT}" == "openj9" ]; then # OpenJ9 only supports building jdk-11 with jdk-11 JDK_BOOT_VERSION="11" - fi - if [ "${JAVA_FEATURE_VERSION}" == "17" ]; then + elif [ "${JAVA_FEATURE_VERSION}" == "11" ] && [ "${VARIANT}" == "hotspot" ] && [ "${ARCHITECTURE}" == "riscv64" ]; then + # RISC-V isn't supported on (and isn't planned to support) anything before JDK 11 + JDK_BOOT_VERSION="11" + elif [ "${JAVA_FEATURE_VERSION}" == "17" ]; then # To support reproducible-builds the jar/jmod --date option is required # which is only available in jdk-17 and from jdk-19 so we cannot bootstrap with JDK16 JDK_BOOT_VERSION="17"