From dcff0c211c4c7c6c7c99c1f934bc5c708eb2b75b Mon Sep 17 00:00:00 2001 From: who-biz <37732338+who-biz@users.noreply.github.com> Date: Sat, 25 Jan 2020 20:01:48 -0500 Subject: [PATCH] Libunwind removal from common linking - Not needed since quite some time ago --- CMakeLists.txt | 8 +------- src/common/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77f48407..d08aaa51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -350,13 +350,7 @@ add_definitions("-DBLOCKCHAIN_DB=${BLOCKCHAIN_DB}") # Can't install hook in static build on OSX, because OSX linker does not support --wrap # On ARM, having libunwind package (with .so's only) installed breaks static link. # When possible, avoid stack tracing using libunwind in favor of using easylogging++. -if (APPLE) - set(LIBUNWIND_LIBRARIES "") -elseif (DEPENDS AND NOT LINUX) - set(LIBUNWIND_LIBRARIES "") -elseif (ARM AND STATIC) - set(LIBUNWIND_LIBRARIES "") -else() +if (CMAKE_BUILD_TYPE STREQUAL "Debug") find_library(UNWIND_LIBRARY unwind) if(UNWIND_LIBRARY) set(UNWIND_LIBRARY ${UNWIND_LIBRARY}) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 36aa150d..b9fb434c 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -76,7 +76,6 @@ monero_add_library(common target_link_libraries(common PUBLIC cncrypto - ${LIBUNWIND_LIBRARIES} ${Boost_DATE_TIME_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}