From 8db2ceb9f340337a7d02d8230a7bff5dd6019b56 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 10 Apr 2020 15:28:14 -0400 Subject: [PATCH] jenkins: fix compiler selection for ppcle Linux https://github.com/nodejs/build/pull/2262 mistakenly added a duplicated case that prevented the previously existing logic from being executed. Merge the two centos cases for ppcle Linux. Signed-off-by: Richard Lau --- jenkins/scripts/select-compiler.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh index 04bf6aaf3..3ebd3bbf4 100644 --- a/jenkins/scripts/select-compiler.sh +++ b/jenkins/scripts/select-compiler.sh @@ -47,10 +47,7 @@ if [ "$SELECT_ARCH" = "PPC64LE" ]; then export LINK="ppc64le-redhat-linux-g++" echo "Compiler set to devtoolset-8" return - fi - ;; - *centos7* ) - if [ "$NODEJS_MAJOR_VERSION" -gt "9" ]; then + elif [ "$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"