Commit fc9e882 1 parent b50a4bc commit fc9e882 Copy full SHA for fc9e882
File tree 2 files changed +8
-13
lines changed
2 files changed +8
-13
lines changed Original file line number Diff line number Diff line change 1
- if (Boost_STACKTRACE_FOUND )
1
+ if (" ${san} " STREQUAL "" )
2
2
target_compile_definitions (clio_options INTERFACE BOOST_STACKTRACE_LINK)
3
3
target_compile_definitions (clio_options INTERFACE BOOST_STACKTRACE_USE_BACKTRACE)
4
4
find_package (libbacktrace REQUIRED CONFIG)
7
7
# capabilities and there are conflicts. In any case, this makes sure Clio code knows that backtrace is not available.
8
8
# See relevant conan profiles for sanitizers where we disable stacktrace in Boost explicitly.
9
9
target_compile_definitions (clio_options INTERFACE CLIO_WITHOUT_STACKTRACE)
10
+ message (STATUS "Sanitizer enabled, disabling stacktrace" )
10
11
endif ()
Original file line number Diff line number Diff line change @@ -38,21 +38,15 @@ target_sources(
38
38
newconfig/ValueView.cpp
39
39
)
40
40
41
+ # This must be above the target_link_libraries call otherwise backtrace doesn't work
42
+ if ("${san} " STREQUAL "" )
43
+ target_link_libraries (clio_util PUBLIC Boost::stacktrace_backtrace dl libbacktrace::libbacktrace)
44
+ endif ()
45
+
41
46
target_link_libraries (
42
- clio_util
43
- PUBLIC Boost::headers
44
- dl
45
- fmt::fmt
46
- openssl::openssl
47
- xrpl::libxrpl
48
- Threads::Threads
49
- clio_options
47
+ clio_util PUBLIC Boost::headers fmt::fmt openssl::openssl xrpl::libxrpl Threads::Threads clio_options
50
48
)
51
49
52
- if (!san)
53
- target_link_libraries (clio_util PUBLIC Boost::stacktrace_backtrace libbacktrace::libbacktrace)
54
- endif ()
55
-
56
50
# FIXME: needed on gcc-12, clang-16 and AppleClang for now (known boost 1.82 issue for some compilers)
57
51
#
58
52
# For some reason cmake doesn't propagate the compile definitions from clio_options so we need to add them here
You can’t perform that action at this time.
0 commit comments