Skip to content

Commit 642d4c8

Browse files
committed
[rtsan] Link in proper CXX ABI library
Test fixing rtsan build breakage.
1 parent 3138eb5 commit 642d4c8

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

compiler-rt/lib/asan/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@ set(ASAN_DYNAMIC_LIBS
148148
${SANITIZER_CXX_ABI_LIBRARIES}
149149
${SANITIZER_COMMON_LINK_LIBS})
150150

151+
message(NOTICE "in asan RTSAN_LINK_LIBS is ${RTSAN_LINK_LIBS}")
152+
message(NOTICE "in asan SANITIZER_CXX_ABI_LIBRARIES is ${RTSAN_LINK_LIBS}")
153+
message(NOTICE "in asan SANITIZER_COMMON_LINK_LIBS is ${SANITIZER_COMMON_LINK_LIBS}")
154+
151155
append_list_if(COMPILER_RT_HAS_LIBDL dl ASAN_DYNAMIC_LIBS)
152156
append_list_if(COMPILER_RT_HAS_LIBRT rt ASAN_DYNAMIC_LIBS)
153157
append_list_if(COMPILER_RT_HAS_LIBM m ASAN_DYNAMIC_LIBS)

compiler-rt/lib/rtsan/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ set(RTSAN_CFLAGS
2727
set(RTSAN_LINK_FLAGS ${COMPILER_RT_COMMON_LINK_FLAGS})
2828
set(RTSAN_LINK_LIBS
2929
${COMPILER_RT_UNWINDER_LINK_LIBS}
30-
${COMPILER_RT_CXX_LINK_LIBS})
30+
${SANITIZER_CXX_ABI_LIBRARIES}
31+
${SANITIZER_COMMON_LINK_LIBS})
32+
33+
message(NOTICE "in rtsan RTSAN_LINK_LIBS is ${RTSAN_LINK_LIBS}")
34+
message(NOTICE "in rtsan SANITIZER_CXX_ABI_LIBRARIES is ${RTSAN_LINK_LIBS}")
35+
message(NOTICE "in rtsan SANITIZER_COMMON_LINK_LIBS is ${SANITIZER_COMMON_LINK_LIBS}")
3136

3237
append_rtti_flag(OFF RTSAN_CFLAGS)
3338

0 commit comments

Comments
 (0)