Skip to content

Commit

Permalink
jenkins: fix compiler selection for ppcle Linux
Browse files Browse the repository at this point in the history
nodejs#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 <riclau@uk.ibm.com>
  • Loading branch information
richardlau committed Apr 10, 2020
1 parent 3a9a24f commit 8db2ceb
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions jenkins/scripts/select-compiler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 8db2ceb

Please sign in to comment.