Skip to content

Commit ef1e4a0

Browse files
committed
ansible,jenkins: install and use GCC 10 on ubuntu2004_sharedlibs
Refs: nodejs#3317
1 parent 4e3a1d8 commit ef1e4a0

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ RUN apt-get update && apt-get install apt-utils -y && \
1919
ccache \
2020
g++-8 \
2121
gcc-8 \
22+
g++-10 \
23+
gcc-10 \
2224
git \
2325
openjdk-17-jre-headless \
2426
pkg-config \

jenkins/scripts/select-compiler.sh

+12
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,18 @@ elif [ "$SELECT_ARCH" = "ARM64" ]; then
239239
fi
240240
echo "Compiler set to GCC" `$CXX -dumpversion`
241241
;;
242+
*ubuntu2004_sharedlibs* )
243+
if [ "$NODEJS_MAJOR_VERSION" -gt "19" ]; then
244+
export CC="ccache gcc-10"
245+
export CXX="ccache g++-10"
246+
export LINK="g++-10"
247+
else
248+
export CC="ccache gcc"
249+
export CXX="ccache g++"
250+
export LINK="g++"
251+
fi
252+
echo "Compiler set to GCC" `$CXX -dumpversion`
253+
;;
242254
esac
243255

244256
fi

0 commit comments

Comments
 (0)