From e4c694baa69a0f7d1078445ad4d5a5b4b59e57f4 Mon Sep 17 00:00:00 2001 From: Violeta Sebe Date: Fri, 4 Mar 2022 13:37:01 -0500 Subject: [PATCH] Set GCC 10.3 compiler for Semeru 17+ builds on Linux Build IBM Semeru 17+ with gcc 10.3.0 instead of gcc 7.5.0. Issue: https://github.com/eclipse-openj9/openj9/issues/14268 Signed-off-by: Violeta Sebe --- build-farm/platform-specific-configurations/linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 build-farm/platform-specific-configurations/linux.sh diff --git a/build-farm/platform-specific-configurations/linux.sh b/build-farm/platform-specific-configurations/linux.sh old mode 100755 new mode 100644 index 09da995dc..4df0c1ca8 --- a/build-farm/platform-specific-configurations/linux.sh +++ b/build-farm/platform-specific-configurations/linux.sh @@ -183,7 +183,7 @@ 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 [ "$JAVA_FEATURE_VERSION" -ge 17 ] && [ "${VARIANT}" != "${BUILD_VARIANT_OPENJ9}" ] && [ -r /usr/local/gcc10/bin/gcc-10.3 ]; then +elif [ "$JAVA_FEATURE_VERSION" -ge 17 ] && [ -r /usr/local/gcc10/bin/gcc-10.3 ]; then export PATH=/usr/local/gcc10/bin:$PATH [ -r /usr/local/gcc10/bin/gcc-10.3 ] && export CC=/usr/local/gcc10/bin/gcc-10.3 [ -r /usr/local/gcc10/bin/g++-10.3 ] && export CXX=/usr/local/gcc10/bin/g++-10.3