Set GCC 10.3 compiler for IBM Semeru 18+ builds on Linux

Build IBM Semeru 18+ with gcc 10.3.0 instead of gcc 7.5.0. Issue: eclipse-openj9/openj9#14268 Signed-off-by: Violeta Sebe <[email protected]>
vsebe · Mar 28, 2022 · 6286a89 · 6286a89
1 parent e9bb1c0
commit 6286a89
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 && "${VARIANT}" != "${BUILD_VARIANT_OPENJ9}" ]] || [[ "$JAVA_FEATURE_VERSION" -ge 18 && "${VARIANT}" == "${BUILD_VARIANT_OPENJ9}" ]] && [ -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