Skip to content

Commit a6dd558

Browse files
committed
Select devtoolset-8 for rhel7-s390x
1 parent d2210e2 commit a6dd558

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

jenkins/scripts/VersionSelectorScript.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ def buildExclusions = [
3737
// Linux PPC LE ------------------------------------------
3838
[ /^centos7-ppcle/, anyType, lt(10) ],
3939
[ /^ppcle-ubuntu/, releaseType, gte(10) ],
40+
[ /^ppcle-ubuntu/, anyType, gte(14) ],
4041

4142
// Linux S390X --------------------------------------------
4243
[ /s390x/, anyType, lt(6) ],

jenkins/scripts/select-compiler.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,14 @@ elif [ "$SELECT_ARCH" = "S390X" ]; then
8686

8787
echo "Setting compiler for Node version $NODEJS_MAJOR_VERSION on s390x"
8888

89-
if [ "$NODEJS_MAJOR_VERSION" -gt "9" ]; then
89+
if [ "$NODEJS_MAJOR_VERSION" -gt "13" ]; then
90+
# Setup devtoolset-8, sets LD_LIBRARY_PATH, PATH, etc.
91+
. /opt/rh/devtoolset-8/enable
92+
export CC="ccache s390x-redhat-linux-gcc"
93+
export CXX="ccache s390x-redhat-linux-g++"
94+
export LINK="s390x-redhat-linux-g++"
95+
echo "Compiler set to devtoolset-8"
96+
elif [ "$NODEJS_MAJOR_VERSION" -gt "9" ]; then
9097
# Setup devtoolset-6, sets LD_LIBRARY_PATH, PATH, etc.
9198
. /opt/rh/devtoolset-6/enable
9299
export CC="ccache s390x-redhat-linux-gcc"

0 commit comments

Comments
 (0)