Skip to content

Commit

Permalink
Fix jdk17u source repo on riscv64 (#3578)
Browse files Browse the repository at this point in the history
The support for riscv64 was merged into jdk17u mainline
  • Loading branch information
luhenry authored Dec 15, 2023
1 parent 4d60aef commit 25f24f4
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions configureBuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ doAnyBuildVariantOverrides() {
BUILD_CONFIG[BRANCH]=${branch:-${BUILD_CONFIG[BRANCH]}}
elif [[ "${BUILD_CONFIG[BUILD_VARIANT]}" == "${BUILD_VARIANT_HOTSPOT}" ]] && [ "${BUILD_CONFIG[OS_ARCHITECTURE]}" == "riscv64" ]; then
if [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK8_CORE_VERSION}" ] \
|| [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK11_CORE_VERSION}" ] \
|| [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK17_CORE_VERSION}" ]; then
|| [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK11_CORE_VERSION}" ]; then
local branch="riscv-port"
BUILD_CONFIG[BRANCH]=${branch:-${BUILD_CONFIG[BRANCH]}}
fi
Expand Down Expand Up @@ -194,8 +193,7 @@ setRepository() {
suffix="adoptium/alpine-jdk8u";
elif [[ "${BUILD_CONFIG[BUILD_VARIANT]}" == "${BUILD_VARIANT_HOTSPOT}" ]] && [ "${BUILD_CONFIG[OS_ARCHITECTURE]}" == "riscv64" ]; then
if [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK8_CORE_VERSION}" ] \
|| [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK11_CORE_VERSION}" ] \
|| [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK17_CORE_VERSION}" ]; then
|| [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK11_CORE_VERSION}" ]; then
suffix="openjdk/riscv-port-${BUILD_CONFIG[OPENJDK_FOREST_NAME]}"
else
suffix="openjdk/${BUILD_CONFIG[OPENJDK_FOREST_NAME]}"
Expand Down

0 comments on commit 25f24f4

Please sign in to comment.