Skip to content

Commit 5c9ab90

Browse files
committed
ansible: update compiler selection for 10.x
- add compiler selection for AIX - add use of newer binutils for PPC - change path to get newer binutils for s390 PR-URL: #1240 Reviewed-By: Rod Vagg <[email protected]>
1 parent 228a598 commit 5c9ab90

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

jenkins/scripts/select-compiler.sh

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ if [ "$DONTSELECT_COMPILER" != "DONT" ]; then
44
case $NODE_NAME in
55
*ppc64_le* ) SELECT_ARCH=PPC64LE ;;
66
*s390x* ) SELECT_ARCH=S390X ;;
7+
*aix* ) SELECT_ARCH=AIXPPC ;;
78
esac
89
fi
910

@@ -17,6 +18,7 @@ if [ "$SELECT_ARCH" = "PPC64LE" ]; then
1718
echo "Setting compiler for Node version $NODE_MAJOR_VERSION on ppc64le"
1819

1920
if [ "$NODE_MAJOR_VERSION" -gt "9" ]; then
21+
export PATH=/usr/lib/binutils-2.26/bin/:$PATH
2022
export COMPILER_LEVEL="4.9"
2123
fi
2224

@@ -40,7 +42,7 @@ elif [ "$SELECT_ARCH" = "S390X" ]; then
4042
echo "Setting compiler for Node version $NODE_MAJOR_VERSION on s390x"
4143

4244
if [ "$NODE_MAJOR_VERSION" -gt "9" ]; then
43-
export PATH="$PATH:/data/gcc-4.9/bin"
45+
export PATH="/data/gcc-4.9/bin:$PATH"
4446
export COMPILER_LEVEL="-4.9"
4547
fi
4648

@@ -51,4 +53,20 @@ elif [ "$SELECT_ARCH" = "S390X" ]; then
5153
export LDFLAGS="-Wl,-rpath,$(dirname $($CC --print-file-name libgcc_s.so))"
5254

5355
echo "Compiler set to $COMPILER_LEVEL"
56+
57+
elif [ "$SELECT_ARCH" = "AIXPPC" ]; then
58+
# get node version
59+
NODE_VERSION="$(python tools/getnodeversion.py)"
60+
NODE_MAJOR_VERSION="$(echo "$NODE_VERSION" | cut -d . -f 1)"
61+
echo "Setting compiler for Node version $NODE_MAJOR_VERSION on AIX"
62+
63+
if [ "$NODE_MAJOR_VERSION" -gt "9" ]; then
64+
export LIBPATH=/home/iojs/gmake/opt/freeware/lib:/home/iojs/gcc-6.3.0-1/opt/freeware/lib
65+
export PATH="/home/iojs/gcc-6.3.0-1/opt/freeware/bin:$PATH"
66+
export CC="ccache `which gcc`" CXX="ccache `which g++`" CXX_host="ccache `which g++`"
67+
echo "Compiler set to 6.3"
68+
else
69+
export CC="ccache `which gcc`" CXX="ccache `which g++`" CXX_host="ccache `which g++`"
70+
echo "Compiler set to default at 4.8.5"
71+
fi
5472
fi

0 commit comments

Comments
 (0)