aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKostya Kortchinsky <kostyak@google.com>2018-01-12 18:45:30 +0000
committerKostya Kortchinsky <kostyak@google.com>2018-01-12 18:45:30 +0000
commit649c2cd4643fbe371426fab3ce9ce1aa547cc2f0 (patch)
tree2e2ba150a8add82581a3da8af256d7c59f9db676
parentfd25fae6ea573d2d1829f4ea1f62ff018e8f557b (diff)
[scudo] Add SANITIZER_CXX_ABI_LIBRARY to SCUDO_DYNAMIC_LIBS
Summary: This is needed for the shared runtime since we are pulling RTUbsan in. Otherwise some builds might fail with errors such as: `error: undefined reference to '__dynamic_cast'` Reviewers: alekseyshl, srhines Reviewed By: srhines Subscribers: kongyi, pirama, chh, mgorny, llvm-commits, #sanitizers Differential Revision: https://reviews.llvm.org/D41995 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@322389 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/scudo/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/scudo/CMakeLists.txt b/lib/scudo/CMakeLists.txt
index 4d26a3477..f86de6a6e 100644
--- a/lib/scudo/CMakeLists.txt
+++ b/lib/scudo/CMakeLists.txt
@@ -32,7 +32,8 @@ if (COMPILER_RT_HAS_MCRC_FLAG)
endif()
if(COMPILER_RT_HAS_SCUDO)
- set(SCUDO_DYNAMIC_LIBS ${SANITIZER_COMMON_LINK_LIBS})
+ set(SCUDO_DYNAMIC_LIBS ${SANITIZER_CXX_ABI_LIBRARY}
+ ${SANITIZER_COMMON_LINK_LIBS})
append_list_if(COMPILER_RT_HAS_LIBDL dl SCUDO_DYNAMIC_LIBS)
append_list_if(COMPILER_RT_HAS_LIBRT rt SCUDO_DYNAMIC_LIBS)
append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread SCUDO_DYNAMIC_LIBS)