From 3fa6737a8b34c2cc1b6127fd5c7f9765f6859d73 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Wed, 4 Mar 2020 01:07:58 +0000 Subject: [PATCH] jenkins: use ccache with devtoolset on ppc64le (#2157) Because devtoolset setup works by putting the devtoolset bin/ on the front of PATH the compiler is called directly instead of via the ccache wrappers. Change select-compiler.sh to explicitly use ccache, as it does for s390x. Co-authored-by: Sam Roberts --- jenkins/scripts/select-compiler.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh index 1c9b515e3..568c6ce1f 100644 --- a/jenkins/scripts/select-compiler.sh +++ b/jenkins/scripts/select-compiler.sh @@ -42,6 +42,9 @@ if [ "$SELECT_ARCH" = "PPC64LE" ]; then if [ "$NODEJS_MAJOR_VERSION" -gt "9" ]; then # Setup devtoolset-6, sets LD_LIBRARY_PATH, PATH, etc. . /opt/rh/devtoolset-6/enable + export CC="ccache ppc64le-redhat-linux-gcc" + export CXX="ccache ppc64le-redhat-linux-g++" + export LINK="ppc64le-redhat-linux-g++" echo "Compiler set to devtoolset-6" return fi