From af7c6eddd84aecbdcbddcc863d39705ecce92b44 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Fri, 24 May 2024 18:35:10 +0100 Subject: [PATCH] fixup! cmake: Build `bitcoin_util` static library Port PR30137. The `target_compile_definitions` command is to be deleted during the next sync/rebase round. --- CMakeLists.txt | 1 - cmake/module/AddThreadsIfNeeded.cmake | 22 +--------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac1e0620df2d4..5ac82c466ade7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,6 @@ if(WITH_BDB) endif() cmake_dependent_option(BUILD_WALLET_TOOL "Build bitcoin-wallet tool." ${BUILD_TESTS} "ENABLE_WALLET" OFF) -option(ENABLE_THREADLOCAL "Enable features that depend on the C++ thread_local keyword (currently just thread names in debug logs)." ON) option(ENABLE_HARDENING "Attempt to harden the resulting executables." ON) option(REDUCE_EXPORTS "Attempt to reduce exported symbols in the resulting executables." OFF) option(WERROR "Treat compiler warnings as errors." OFF) diff --git a/cmake/module/AddThreadsIfNeeded.cmake b/cmake/module/AddThreadsIfNeeded.cmake index 8b60bc7466c05..8c61a513ab7d2 100644 --- a/cmake/module/AddThreadsIfNeeded.cmake +++ b/cmake/module/AddThreadsIfNeeded.cmake @@ -18,25 +18,5 @@ function(add_threads_if_needed) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) set_target_properties(Threads::Threads PROPERTIES IMPORTED_GLOBAL TRUE) - - if(MINGW) - #[=[ - mingw32's implementation of thread_local has been shown to behave - erroneously under concurrent usage. - See: - - https://github.com/bitcoin/bitcoin/pull/15849 - - https://gist.github.com/jamesob/fe9a872051a88b2025b1aa37bfa98605 - ]=] - elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - #[=[ - FreeBSD's implementation of thread_local is buggy. - See: - - https://github.com/bitcoin/bitcoin/pull/16059 - - https://groups.google.com/d/msg/bsdmailinglist/22ncTZAbDp4/Dii_pII5AwAJ - ]=] - elseif(ENABLE_THREADLOCAL) - target_compile_definitions(core_interface INTERFACE - "$<$:HAVE_THREAD_LOCAL>" - ) - endif() + target_compile_definitions(core_interface INTERFACE HAVE_THREAD_LOCAL) endfunction()