Skip to content

Commit 77b0a80

Browse files
committed
Merge bitcoin/bitcoin#27682: build: Bump minimum supported Clang to clang-10
fa199ee ci: Drop NO_WERROR=1 for clang-10 build (MarcoFalke) fad2c20 build: Bump minimum Clang to clang-10 (MarcoFalke) fad7cfe doc: Remove outdated CentOS comment (MarcoFalke) Pull request description: It doesn't make sense to support a minimum clang version that is difficult to install on all supported operating systems, which generally ship a later version: * Ubuntu Focal 20.04: https://packages.ubuntu.com/focal/clang-10 and https://packages.ubuntu.com/focal/clang-12 * Debian Bullseye: https://packages.debian.org/bullseye/clang-13 * CentOS 8 Stream: All Clang versions from 11.0 to 15.0 Also, it allows to drop build code, which means it won't waste review when rolling over into cmake (`cmake/module/CheckStdFilesystem.cmake`). ACKs for top commit: hebasto: ACK fa199ee fanquake: ACK fa199ee Tree-SHA512: c1a0e8f191a6db866b8be3c9d254dc3f576fa021e2eaaeb68f3354554a8b38eaa90bbf9871ff92351b715e62a6b7b98cf94eba6dc53d7c951bddb6ad49ba7716
2 parents 4e8a765 + fa199ee commit 77b0a80

File tree

4 files changed

+6
-19
lines changed

4 files changed

+6
-19
lines changed

build-aux/m4/l_filesystem.m4

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ dnl Distributed under the MIT software license, see the accompanying
33
dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
# GCC 8.1 and earlier requires -lstdc++fs
6-
# Clang 8.0.0 (libc++) and earlier requires -lc++fs
76

87
m4_define([_CHECK_FILESYSTEM_testbody], [[
98
#include <filesystem>
@@ -26,20 +25,12 @@ AC_DEFUN([CHECK_FILESYSTEM], [
2625
AC_MSG_RESULT([yes])
2726
],[
2827
AC_MSG_RESULT([no])
29-
SAVED_LIBS="$LIBS"
30-
LIBS="$SAVED_LIBS -lstdc++fs"
28+
LIBS="$LIBS -lstdc++fs"
3129
AC_MSG_CHECKING([whether std::filesystem needs -lstdc++fs])
3230
AC_LINK_IFELSE([AC_LANG_SOURCE([_CHECK_FILESYSTEM_testbody])],[
3331
AC_MSG_RESULT([yes])
34-
],[
35-
AC_MSG_RESULT([no])
36-
AC_MSG_CHECKING([whether std::filesystem needs -lc++fs])
37-
LIBS="$SAVED_LIBS -lc++fs"
38-
AC_LINK_IFELSE([AC_LANG_SOURCE([_CHECK_FILESYSTEM_testbody])],[
39-
AC_MSG_RESULT([yes])
4032
],[
4133
AC_MSG_FAILURE([cannot figure out how to use std::filesystem])
42-
])
4334
])
4435
])
4536

ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_nowallet_libbitcoinkernel
1010
export CI_IMAGE_NAME_TAG="ubuntu:20.04"
11-
# Use minimum supported python3.8 and clang-8, see doc/dependencies.md
12-
export PACKAGES="python3-zmq clang-8 llvm-8 libc++abi-8-dev libc++-8-dev"
13-
export DEP_OPTS="NO_WALLET=1 CC=clang-8 CXX='clang++-8 -stdlib=libc++'"
11+
# Use minimum supported python3.8 and clang-10, see doc/dependencies.md
12+
export PACKAGES="python3-zmq clang-10 llvm-10 libc++abi-10-dev libc++-10-dev"
13+
export DEP_OPTS="NO_WALLET=1 CC=clang-10 CXX='clang++-10 -stdlib=libc++'"
1414
export GOAL="install"
15-
export NO_WERROR=1
16-
export BITCOIN_CONFIG="--enable-reduce-exports CC=clang-8 CXX='clang++-8 -stdlib=libc++' --enable-experimental-util-chainstate --with-experimental-kernel-lib --enable-shared"
15+
export BITCOIN_CONFIG="--enable-reduce-exports --enable-experimental-util-chainstate --with-experimental-kernel-lib --enable-shared"

ci/test/06_script_b.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ fi
5252

5353
if [ -z "$NO_DEPENDS" ]; then
5454
if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then
55-
# CentOS has problems building the depends if the config shell is not explicitly set
56-
# (i.e. for libevent a Makefile with an empty SHELL variable is generated, leading to
57-
# an error as the first command is executed)
5855
SHELL_OPTS="LC_ALL=en_US.UTF-8 CONFIG_SHELL=/bin/dash"
5956
else
6057
SHELL_OPTS="CONFIG_SHELL="

doc/dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ You can find installation instructions in the `build-*.md` file for your platfor
88
| --- | --- |
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) |
11-
| [Clang](https://clang.llvm.org) | [8.0](https://github.com/bitcoin/bitcoin/pull/24164) |
11+
| [Clang](https://clang.llvm.org) | [10.0](https://github.com/bitcoin/bitcoin/pull/27682) |
1212
| [GCC](https://gcc.gnu.org) | [8.1](https://github.com/bitcoin/bitcoin/pull/23060) |
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 |

0 commit comments

Comments
 (0)