diff options
| author | Sebastian Falbesoner <sebastian.falbesoner@gmail.com> | 2020-01-08 23:36:46 +0100 |
|---|---|---|
| committer | Sebastian Falbesoner <sebastian.falbesoner@gmail.com> | 2020-01-08 23:36:46 +0100 |
| commit | ef63f5fc1136ad2a2cd080d44142a2ee3945c238 (patch) | |
| tree | 7b6901c7b4e42d4e8ad083127b3177bd714ab85a /ci/test/05_before_script.sh | |
| parent | 6196e930018181301b5972842ae384ea4288ff34 (diff) | |
ci: Combine 32-bit build with CentOS 7 build
Diffstat (limited to 'ci/test/05_before_script.sh')
| -rwxr-xr-x | ci/test/05_before_script.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ci/test/05_before_script.sh b/ci/test/05_before_script.sh index 1222432c96..d8aa5c87a2 100755 --- a/ci/test/05_before_script.sh +++ b/ci/test/05_before_script.sh @@ -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 |