From e68ea86cc4e255154686bc9145a2e1bd8546a7c9 Mon Sep 17 00:00:00 2001 From: NanoAkron Date: Mon, 9 Jan 2017 13:38:54 +0000 Subject: [PATCH] Change logic of testing for libunwind on OSX and ARM --- CMakeLists.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e42cdb384..eea161bdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -273,14 +273,19 @@ endif() add_definitions("-DBLOCKCHAIN_DB=${BLOCKCHAIN_DB}") -find_package(Libunwind) # 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. -if(LIBUNWIND_FOUND AND NOT (STATIC AND (APPLE OR ARM))) - set(DEFAULT_STACK_TRACE ON) -else() +if(APPLE OR (ARM AND STATIC)) set(DEFAULT_STACK_TRACE OFF) set(LIBUNWIND_LIBRARIES "") +else() + find_package(Libunwind) + if(LIBUNWIND_FOUND) + set(DEFAULT_STACK_TRACE ON) + else() + set(DEFAULT_STACK_TRACE OFF) + set(LIBUNWIND_LIBRARIES "") + endif() endif() option(STACK_TRACE "Install a hook that dumps stack on exception" ${DEFAULT_STACK_TRACE})