summaryrefslogtreecommitdiffstats
path: root/libcxx/cmake
diff options
context:
space:
mode:
authorJonas Hahnfeld <hahnjo@hahnjo.de>2019-02-17 12:16:20 +0000
committerJonas Hahnfeld <hahnjo@hahnjo.de>2019-02-17 12:16:20 +0000
commit66c60d9d714bed88765c1575fbf57e7582fd27a3 (patch)
tree10985015d08c8b88087c54ca15b17d75ff7ce8b3 /libcxx/cmake
parent91ecb69acdf4cffb4f879e12716465169848633e (diff)
downloadbcm5719-llvm-66c60d9d714bed88765c1575fbf57e7582fd27a3.tar.gz
bcm5719-llvm-66c60d9d714bed88765c1575fbf57e7582fd27a3.zip
[compiler-rt] Build custom libcxx with libcxxabi
This changes add_custom_libcxx to also build libcxxabi and merges the two into a static and hermetic library. There are multiple advantages: 1) The resulting libFuzzer doesn't expose C++ internals and looks like a plain C library. 2) We don't have to manually link in libstdc++ to provide cxxabi. 3) The sanitizer tests cannot interfere with an installed version of libc++.so in LD_LIBRARY_PATH. Differential Revision: https://reviews.llvm.org/D58013 llvm-svn: 354212
Diffstat (limited to 'libcxx/cmake')
-rw-r--r--libcxx/cmake/Modules/HandleLibCXXABI.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake
index 1c19d7e01af..89f2e97d8b1 100644
--- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake
+++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake
@@ -98,7 +98,7 @@ if ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libstdc++" OR
elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi")
if (LIBCXX_CXX_ABI_INTREE)
# Link against just-built "cxxabi" target.
- if (LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
+ if (LIBCXX_ENABLE_STATIC_ABI_LIBRARY)
set(CXXABI_LIBNAME cxxabi_static)
else()
set(CXXABI_LIBNAME cxxabi_shared)
OpenPOWER on IntegriCloud