diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-04-30 09:59:07 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-04-30 12:50:36 -0400 |
| commit | aaaacff107a71e2495eff17602fa2bec52c02e4d (patch) | |
| tree | 132e746a17557f17ae183026b61a668431ff685d /ci | |
| parent | a66ba6d029b3948dec0cf092bb844f70c16b07dc (diff) | |
ci: Merge C++17 build with one of the existing ones
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/test/00_setup_env_native_cxx17.sh | 13 | ||||
| -rw-r--r-- | ci/test/00_setup_env_native_qt5.sh | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/ci/test/00_setup_env_native_cxx17.sh b/ci/test/00_setup_env_native_cxx17.sh deleted file mode 100644 index 9a75276420..0000000000 --- a/ci/test/00_setup_env_native_cxx17.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (c) 2020 The Bitcoin Core developers -# Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. - -export LC_ALL=C.UTF-8 - -export CONTAINER_NAME=ci_native_cxx17 -export PACKAGES="python3-zmq libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev" -export NO_DEPENDS=1 -export GOAL="install" -export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --enable-c++17" diff --git a/ci/test/00_setup_env_native_qt5.sh b/ci/test/00_setup_env_native_qt5.sh index 87c8b70998..4dedea23bc 100644 --- a/ci/test/00_setup_env_native_qt5.sh +++ b/ci/test/00_setup_env_native_qt5.sh @@ -14,4 +14,4 @@ export RUN_UNIT_TESTS_SEQUENTIAL="true" export RUN_UNIT_TESTS="false" export GOAL="install" export TEST_PREVIOUS_RELEASES=true -export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-debug CFLAGS=\"-g0 -O2 -funsigned-char\" CXXFLAGS=\"-g0 -O2 -funsigned-char\"" +export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-c++17 --enable-debug CFLAGS=\"-g0 -O2 -funsigned-char\" CXXFLAGS=\"-g0 -O2 -funsigned-char\"" |