From 25b4939b042ab6c00aa0f0c5f106b89e672d7a82 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Thu, 16 Jan 2020 15:51:07 -0500 Subject: [PATCH] test --- ci/test/00_setup_env_i686_centos.sh | 2 +- ci/test/05_before_script.sh | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ci/test/00_setup_env_i686_centos.sh b/ci/test/00_setup_env_i686_centos.sh index b875dceef0a1a..64a9715a3bd2e 100644 --- a/ci/test/00_setup_env_i686_centos.sh +++ b/ci/test/00_setup_env_i686_centos.sh @@ -10,5 +10,5 @@ export HOST=i686-pc-linux-gnu export DOCKER_NAME_TAG=centos:7 export DOCKER_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python36-zmq which patch lbzip2 dash" export GOAL="install" -export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports" +export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports LDFLAGS=-static-libstdc++" export CONFIG_SHELL="/bin/dash" diff --git a/ci/test/05_before_script.sh b/ci/test/05_before_script.sh index d8aa5c87a22f2..1222432c96703 100755 --- a/ci/test/05_before_script.sh +++ b/ci/test/05_before_script.sh @@ -25,13 +25,5 @@ if [[ $HOST = *-mingw32 ]]; then DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\) fi if [ -z "$NO_DEPENDS" ]; then - 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 + DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS fi