From afca78149af8aa8df73c7b0409c6107de5c99ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Fri, 22 Sep 2023 10:17:44 +0200 Subject: [PATCH] ansible,jenkins: install and select gcc-10 on debian10 Refs: https://github.com/nodejs/build/issues/3317 --- ansible/roles/baselayout/vars/main.yml | 2 +- jenkins/scripts/select-compiler.sh | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index 5d2237302..6a008efd2 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -68,7 +68,7 @@ packages: { ], debian10: [ - 'gcc-8,g++-8,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip', + 'gcc-8,g++-8,gcc-10,g++-10,ccache,git,curl,libfontconfig1,apt-transport-https,ca-certificates,sudo,python3-pip', ], fedora: [ diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh index c94661424..2cdf1236f 100644 --- a/jenkins/scripts/select-compiler.sh +++ b/jenkins/scripts/select-compiler.sh @@ -210,6 +210,18 @@ elif [ "$SELECT_ARCH" = "X64" ]; then fi echo "Compiler set to GCC" `$CXX -dumpversion` ;; + debian10-x64 ) + 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-8" + export CXX="ccache g++-8" + export LINK="g++-8" + fi + echo "Compiler set to GCC" `$CXX -dumpversion` + ;; esac elif [ "$SELECT_ARCH" = "ARM64" ]; then