diff options
| author | Ed Maste <emaste@freebsd.org> | 2017-04-12 13:51:00 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@freebsd.org> | 2017-04-12 13:51:00 +0000 |
| commit | e544379b30cc103d5cb8f406516f848a0004ca31 (patch) | |
| tree | a3ec045b0cae6a05950af59d56af0459bf73e9f6 /llvm/lib/Support | |
| parent | 22776892c9aad3cedd2f3692d324ff45af1b29fb (diff) | |
| download | bcm5719-llvm-e544379b30cc103d5cb8f406516f848a0004ca31.tar.gz bcm5719-llvm-e544379b30cc103d5cb8f406516f848a0004ca31.zip | |
Fix detection of backtrace() availability on FreeBSD
On FreeBSD backtrace is not part of libc and depends on libexecinfo
being available. Instead of using manual checks we can use the builtin
CMake module FindBacktrace.cmake to detect availability of backtrace()
in a portable way.
Patch By: Alex Richardson
Differential Revision: https://reviews.llvm.org/D27143
llvm-svn: 300062
Diffstat (limited to 'llvm/lib/Support')
| -rw-r--r-- | llvm/lib/Support/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | llvm/lib/Support/Unix/Signals.inc | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt index a46167e8714..491614b4bf6 100644 --- a/llvm/lib/Support/CMakeLists.txt +++ b/llvm/lib/Support/CMakeLists.txt @@ -9,6 +9,9 @@ elseif( CMAKE_HOST_UNIX ) if( HAVE_LIBDL ) set(system_libs ${system_libs} ${CMAKE_DL_LIBS}) endif() + if( HAVE_BACKTRACE ) + set(system_libs ${system_libs} ${Backtrace_LIBRARIES}) + endif() if(LLVM_ENABLE_TERMINFO) if(HAVE_TERMINFO) set(system_libs ${system_libs} ${TERMINFO_LIBS}) @@ -140,7 +143,7 @@ add_llvm_library(LLVMSupport Windows ${LLVM_MAIN_INCLUDE_DIR}/llvm/ADT ${LLVM_MAIN_INCLUDE_DIR}/llvm/Support - + ${Backtrace_INCLUDE_DIRS} LINK_LIBS ${system_libs} ) diff --git a/llvm/lib/Support/Unix/Signals.inc b/llvm/lib/Support/Unix/Signals.inc index 756d0f5a95e..88ad21e9806 100644 --- a/llvm/lib/Support/Unix/Signals.inc +++ b/llvm/lib/Support/Unix/Signals.inc @@ -25,8 +25,8 @@ #include "llvm/Support/raw_ostream.h" #include <algorithm> #include <string> -#if HAVE_EXECINFO_H -# include <execinfo.h> // For backtrace(). +#ifdef HAVE_BACKTRACE +# include BACKTRACE_HEADER // For backtrace(). #endif #if HAVE_SIGNAL_H #include <signal.h> |
