Skip to content

Commit

Permalink
Switch JDK17 to GCC10 as well as JDK18+ (#2861)
Browse files Browse the repository at this point in the history
* Switch to GCC10 for non-J9 builds of JDK17+

Signed-off-by: Stewart X Addison <[email protected]>
  • Loading branch information
sxa authored Mar 1, 2022
1 parent 08b7c7d commit 2ac2eac
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build-farm/platform-specific-configurations/linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ if [ "${VARIANT}" == "${BUILD_VARIANT_DRAGONWELL}" ] && [ "$JAVA_FEATURE_VERSION
export PATH=/usr/local/gcc9/bin:$PATH
export CC=/usr/local/gcc9/bin/gcc-9.3
export CXX=/usr/local/gcc9/bin/g++-9.3
# Enable GCC 10 for Java 18+ for repeatable builds, but not for our supported releases
# 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" -gt 17 ] && [ "${VARIANT}" != "${BUILD_VARIANT_OPENJ9}" ] && [ -r /usr/local/gcc10/bin/gcc-10.3 ]; then
elif [ "$JAVA_FEATURE_VERSION" -ge 17 ] && [ "${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
Expand Down

0 comments on commit 2ac2eac

Please sign in to comment.