Skip to content

Commit

Permalink
Libunwind removal from common linking
Browse files Browse the repository at this point in the history
- Not needed since quite some time ago
  • Loading branch information
who-biz committed Jan 26, 2020
1 parent 5be3498 commit dcff0c2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
8 changes: 1 addition & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion src/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit dcff0c2

Please sign in to comment.