ansible,jenkins: install and use GCC 10 on ubuntu2004_sharedlibs

Refs: nodejs#3317
targos · Sep 13, 2023 · ef1e4a0 · ef1e4a0
1 parent 4e3a1d8
commit ef1e4a0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2
@@ -19,6 +19,8 @@ RUN apt-get update && apt-get install apt-utils -y && \
       ccache \
       g++-8 \
       gcc-8 \
+      g++-10 \
+      gcc-10 \
       git \
       openjdk-17-jre-headless \
       pkg-config \

diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh
@@ -239,6 +239,18 @@ elif [ "$SELECT_ARCH" = "ARM64" ]; then
       fi
       echo "Compiler set to GCC" `$CXX -dumpversion`
       ;;
+    *ubuntu2004_sharedlibs* )
+      if [ "$NODEJS_MAJOR_VERSION" -gt "19" ]; then
+        export CC="ccache gcc-10"
+        export CXX="ccache g++-10"
+        export LINK="g++-10"
+      else
+        export CC="ccache gcc"
+        export CXX="ccache g++"
+        export LINK="g++"
+      fi
+      echo "Compiler set to GCC" `$CXX -dumpversion`
+      ;;
   esac
 
 fi