From ef1e4a0077b97fc68f03db4e1a25af4ff438642d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Wed, 13 Sep 2023 17:29:06 +0200 Subject: [PATCH] ansible,jenkins: install and use GCC 10 on ubuntu2004_sharedlibs Refs: https://github.com/nodejs/build/issues/3317 --- .../templates/ubuntu2004_sharedlibs.Dockerfile.j2 | 2 ++ jenkins/scripts/select-compiler.sh | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 b/ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2 index b45b2e01f..f15a62939 100644 --- 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 index 2e713f072..e5f6bd12b 100644 --- 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