Skip to content

Commit fa953f1

Browse files
author
MarcoFalke
committed
build: Bump minimum supported GCC to g++-9
Also, update the code to use constexpr, which does not work in g++-8. Also, drop the no longer needed build-aux/m4/l_filesystem.m4.
1 parent fa69955 commit fa953f1

File tree

6 files changed

+5
-47
lines changed

6 files changed

+5
-47
lines changed

build-aux/m4/l_filesystem.m4

Lines changed: 0 additions & 38 deletions
This file was deleted.

ci/test/00_setup_env_native_qt5.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_qt5
1010
export CI_IMAGE_NAME_TAG="ubuntu:20.04"
11-
# Use minimum supported python3.8 and gcc-8 (or best-effort gcc-9), see doc/dependencies.md
11+
# Use minimum supported python3.8 and gcc-9, see doc/dependencies.md
1212
export PACKAGES="gcc-9 g++-9 python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libharfbuzz-dev"
1313
export DEP_OPTS="NO_QT=1 NO_UPNP=1 NO_NATPMP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1 CC=gcc-9 CXX=g++-9"
1414
export TEST_RUNNER_EXTRA="--previous-releases --coverage --extended --exclude feature_dbcrash" # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash

configure.ac

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,6 @@ else
115115
AX_CXX_COMPILE_STDCXX([20], [noext], [mandatory])
116116
fi
117117

118-
dnl check if additional link flags are required for std::filesystem
119-
CHECK_FILESYSTEM
120-
121118
dnl Unless the user specified OBJCXX, force it to be the same as CXX. This ensures
122119
dnl that we get the same -std flags for both.
123120
m4_ifdef([AC_PROG_OBJCXX],[

doc/dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You can find installation instructions in the `build-*.md` file for your platfor
99
| [Autoconf](https://www.gnu.org/software/autoconf/) | [2.69](https://github.com/bitcoin/bitcoin/pull/17769) |
1010
| [Automake](https://www.gnu.org/software/automake/) | [1.13](https://github.com/bitcoin/bitcoin/pull/18290) |
1111
| [Clang](https://clang.llvm.org) | [10.0](https://github.com/bitcoin/bitcoin/pull/27682) |
12-
| [GCC](https://gcc.gnu.org) | [8.1](https://github.com/bitcoin/bitcoin/pull/23060) |
12+
| [GCC](https://gcc.gnu.org) | [9.1](https://github.com/bitcoin/bitcoin/pull/27662) |
1313
| [Python](https://www.python.org) (scripts, tests) | [3.8](https://github.com/bitcoin/bitcoin/pull/27483) |
1414
| [systemtap](https://sourceware.org/systemtap/) ([tracing](tracing.md))| N/A |
1515

src/qt/addresstablemodel.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,14 @@ struct AddressTableEntryLessThan
5353
};
5454

5555
/* Determine address type from address purpose */
56-
static AddressTableEntry::Type translateTransactionType(wallet::AddressPurpose purpose, bool isMine)
56+
constexpr AddressTableEntry::Type translateTransactionType(wallet::AddressPurpose purpose, bool isMine)
5757
{
5858
// "refund" addresses aren't shown, and change addresses aren't returned by getAddresses at all.
5959
switch (purpose) {
6060
case wallet::AddressPurpose::SEND: return AddressTableEntry::Sending;
6161
case wallet::AddressPurpose::RECEIVE: return AddressTableEntry::Receiving;
6262
case wallet::AddressPurpose::REFUND: return AddressTableEntry::Hidden;
63-
// No default case to allow for compiler to warn
64-
}
63+
} // no default case, so the compiler can warn about missing cases
6564
assert(false);
6665
}
6766

src/txrequest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ struct Announcement {
6969
const bool m_is_wtxid : 1;
7070

7171
/** What state this announcement is in.
72-
* This is a uint8_t instead of a State to silence a GCC warning in versions prior to 8.4 and 9.3.
72+
* This is a uint8_t instead of a State to silence a GCC warning in versions prior to 9.3.
7373
* See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61414 */
7474
uint8_t m_state : 3;
7575

0 commit comments

Comments
 (0)