[PATCH] D49157: Add libcxxabi option back for sanitizer use.

[Stephen Hines via Phabricator via llvm-commits]

srhines created this revision.
srhines added a reviewer: phosek.
Herald added subscribers: Sanitizers, llvm-commits, delcypher, mgorny.
Herald added a reviewer: EricWF.

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.


Repository:
  rCRT Compiler Runtime

https://reviews.llvm.org/D49157

Files:
  CMakeLists.txt


Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -353,6 +353,8 @@
   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()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D49157.154892.patch
Type: text/x-patch
Size: 495 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180710/e7051961/attachment.bin>