diff options
| author | Stephen Hines <srhines@google.com> | 2018-07-11 00:50:03 +0000 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2018-07-11 00:50:03 +0000 |
| commit | 6812c28ef3dbb5a3ed2d717499b68c3831fbc20f (patch) | |
| tree | 3a1f45bc869a1f140231d9ac109eb842443cc3b4 | |
| parent | 32ee712435e8a157e4c757223bc11418c1346ff8 (diff) | |
| download | bcm5719-llvm-6812c28ef3dbb5a3ed2d717499b68c3831fbc20f.tar.gz bcm5719-llvm-6812c28ef3dbb5a3ed2d717499b68c3831fbc20f.zip | |
Add libcxxabi option back for sanitizer use.
Summary:
A prior refactoring accidentally dropped the case for using libc++abi as
the out-of-tree C++ runtime library for sanitizers. This patch restores
that functionality, which is used by Android, which can't depend on the
full libc++ for these libraries.
Reviewers: phosek, EricWF
Reviewed By: phosek
Subscribers: meikeb, kongyi, chh, mgorny, delcypher, llvm-commits, #sanitizers, pirama
Differential Revision: https://reviews.llvm.org/D49157
llvm-svn: 336749
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 6ece416f484..be4066f221e 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -353,6 +353,8 @@ if (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libc++") else() append_list_if(COMPILER_RT_HAS_LIBCXX c++ SANITIZER_CXX_ABI_LIBRARY) endif() +elseif (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libcxxabi") + list(APPEND SANITIZER_CXX_ABI_LIBRARY "c++abi") elseif (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libstdc++") append_list_if(COMPILER_RT_HAS_LIBSTDCXX stdc++ SANITIZER_CXX_ABI_LIBRARY) endif() |
