highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-25 22:39:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: Combine 32-bit build with CentOS 7 build

Browse Source
This commit is contained in:
Sebastian Falbesoner
2020-01-08 23:36:46 +01:00
parent 6196e93001
commit ef63f5fc11
5 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ci/test/05_before_script.sh
View File

@@ -25,5 +25,13 @@ if [[ $HOST = *-mingw32 ]]; then
DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\)
fi
if [ -z "$NO_DEPENDS" ]; then
DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
if [[ $DOCKER_NAME_TAG == centos* ]]; then
# CentOS has problems building the depends if the config shell is not explicitely set
# (i.e. for libevent a Makefile with an empty SHELL variable is generated, leading to
# an error as the first command is executed)
SHELL_OPTS="CONFIG_SHELL=/bin/bash"
else
SHELL_OPTS="CONFIG_SHELL="
fi
DOCKER_EXEC $SHELL_OPTS make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS
fi