From 383de60e3da7bfcb9ae253090f5100f5f948ccfd Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Thu, 21 Dec 2023 16:40:56 +0100 Subject: [PATCH] Enable GCC 10 for RISC-V (#3590) * Enable GCC 10 for RISC-V Given the rapid evolution of RISC-V, the newer the GCC toolchain, the better. --- build-farm/platform-specific-configurations/linux.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-farm/platform-specific-configurations/linux.sh b/build-farm/platform-specific-configurations/linux.sh index 655cd16c0..3bc43a484 100755 --- a/build-farm/platform-specific-configurations/linux.sh +++ b/build-farm/platform-specific-configurations/linux.sh @@ -331,6 +331,10 @@ if [ "${VARIANT}" == "${BUILD_VARIANT_DRAGONWELL}" ] && [ "$JAVA_FEATURE_VERSION export CXX=/usr/local/gcc9/bin/g++-9.3 # Enable GCC 10 for Java 17+ for repeatable builds, but not for our supported releases # Ref https://github.com/adoptium/temurin-build/issues/2787 +elif [ "${ARCHITECTURE}" == "riscv64" ] && [ -r /usr/bin/gcc-10 ]; then + # Enable GCC 10 for RISC-V, given the rapid evolution of RISC-V, the newer the GCC toolchain, the better + [ -r /usr/bin/gcc-10 ] && export CC=/usr/bin/gcc-10 + [ -r /usr/bin/g++-10 ] && export CXX=/usr/bin/g++-10 elif [ "$JAVA_FEATURE_VERSION" -ge 19 ] && [ -r /usr/local/gcc11/bin/gcc-11.2 ]; then export PATH=/usr/local/gcc11/bin:$PATH [ -r /usr/local/gcc11/bin/gcc-11.2 ] && export CC=/usr/local/gcc11/bin/gcc-11.2