Skip to content

Commit b136882

Browse files
author
Marco Magdy
committed
Revert "Making libbacktrace optional (awslabs#189)"
This reverts commit e08ca6e.
1 parent e08ca6e commit b136882

File tree

3 files changed

+17
-34
lines changed

3 files changed

+17
-34
lines changed

CMakeLists.txt

+16-23
Original file line numberDiff line numberDiff line change
@@ -47,29 +47,8 @@ endif()
4747

4848
target_include_directories(${PROJECT_NAME} PRIVATE ${CURL_INCLUDE_DIRS})
4949

50-
find_package(Backtrace QUIET)
51-
if (${Backtrace_FOUND})
52-
target_link_libraries(${PROJECT_NAME} PRIVATE ${Backtrace_LIBRARIES})
53-
54-
find_library(DW_LIB NAMES dw)
55-
if (NOT DW_LIB STREQUAL DW_LIB-NOTFOUND)
56-
message("-- Enhanced stack-traces are enabled via libdw: ${DW_LIB}")
57-
target_compile_definitions(${PROJECT_NAME} PRIVATE "BACKWARD_HAS_DW=1")
58-
target_link_libraries(${PROJECT_NAME} PUBLIC "${DW_LIB}")
59-
else()
60-
find_library(BFD_LIB NAMES bfd)
61-
if (NOT BFD_LIB STREQUAL BFD_LIB-NOTFOUND)
62-
message("-- Enhanced stack-traces are enabled via libbfd: ${BFD_LIB}")
63-
target_compile_definitions(${PROJECT_NAME} PRIVATE "BACKWARD_HAS_BFD=1")
64-
target_link_libraries(${PROJECT_NAME} PRIVATE "${BFD_LIB}")
65-
endif()
66-
endif()
67-
68-
else()
69-
message("-- libbacktrace was not installed. Stacktracing will be disabled")
70-
add_definitions(-Dno_backtrace)
71-
endif()
72-
50+
find_package(Backtrace REQUIRED)
51+
target_link_libraries(${PROJECT_NAME} PRIVATE ${Backtrace_LIBRARIES})
7352

7453
target_compile_options(${PROJECT_NAME} PRIVATE
7554
"-fno-exceptions"
@@ -82,6 +61,20 @@ target_compile_options(${PROJECT_NAME} PRIVATE
8261
"-Wconversion"
8362
"-Wno-sign-conversion")
8463

64+
find_library(DW_LIB NAMES dw)
65+
if (NOT DW_LIB STREQUAL DW_LIB-NOTFOUND)
66+
message("-- Enhanced stack-traces are enabled via libdw: ${DW_LIB}")
67+
target_compile_definitions(${PROJECT_NAME} PRIVATE "BACKWARD_HAS_DW=1")
68+
target_link_libraries(${PROJECT_NAME} PUBLIC "${DW_LIB}")
69+
else()
70+
find_library(BFD_LIB NAMES bfd)
71+
if (NOT BFD_LIB STREQUAL BFD_LIB-NOTFOUND)
72+
message("-- Enhanced stack-traces are enabled via libbfd: ${BFD_LIB}")
73+
target_compile_definitions(${PROJECT_NAME} PRIVATE "BACKWARD_HAS_BFD=1")
74+
target_link_libraries(${PROJECT_NAME} PRIVATE "${BFD_LIB}")
75+
endif()
76+
endif()
77+
8578
if (LOG_VERBOSITY)
8679
target_compile_definitions(${PROJECT_NAME} PRIVATE "AWS_LAMBDA_LOG=${LOG_VERBOSITY}")
8780
elseif(CMAKE_BUILD_TYPE STREQUAL Debug)

src/backward.cpp

+1-5
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,10 @@
2323
// - g++/clang++ -lbfd ...
2424
// #define BACKWARD_HAS_BFD 1
2525

26-
#ifndef no_backtrace
27-
28-
# include "backward.h"
26+
#include "backward.h"
2927

3028
namespace backward {
3129

3230
backward::SignalHandling sh;
3331

3432
} // namespace backward
35-
36-
#endif

src/backward.h

-6
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
# error "It's not going to compile without a C++ compiler..."
2929
#endif
3030

31-
#ifdef no_backtrace
32-
# pragma message "Disabling stacktracing"
33-
#else
34-
3531
#if defined(BACKWARD_CXX11)
3632
#elif defined(BACKWARD_CXX98)
3733
#else
@@ -4543,6 +4539,4 @@ class SignalHandling {
45434539

45444540
} // namespace backward
45454541

4546-
#endif /* no_backtrace */
4547-
45484542
#endif /* H_GUARD */

0 commit comments

Comments
 (0)