aboutsummaryrefslogtreecommitdiff
path: root/clang/cmake
diff options
context:
space:
mode:
authorLouis Dionne <ldionne.2@gmail.com>2022-03-01 08:42:13 -0500
committerLouis Dionne <ldionne.2@gmail.com>2022-05-13 08:32:09 -0400
commita80e65e00ada7a9c16acf17a5fd40b4f12ced3a8 (patch)
tree4353e52081ad05a3ef0890c95c5e8378a8e0fc6b /clang/cmake
parent4be105c98a9c7e083cd878ee1751e11160b97b4a (diff)
downloadllvm-a80e65e00ada7a9c16acf17a5fd40b4f12ced3a8.zip
llvm-a80e65e00ada7a9c16acf17a5fd40b4f12ced3a8.tar.gz
llvm-a80e65e00ada7a9c16acf17a5fd40b4f12ced3a8.tar.bz2
[libc++] Overhaul how we select the ABI library
This patch overhauls how we pick up the ABI library. Instead of setting ad-hoc flags, it creates interface targets that can be linked against by the rest of the build, which is easier to follow and extend to support new ABI libraries. This is intended to be a NFC change, however there are some additional simplifications and improvements we can make in the future that would require a slight behavior change. Differential Revision: https://reviews.llvm.org/D120727
Diffstat (limited to 'clang/cmake')
-rw-r--r--clang/cmake/caches/CrossWinToARMLinux.cmake2
1 files changed, 0 insertions, 2 deletions
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 90af9d9..0c71b67 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -152,8 +152,6 @@ set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_USE_COMPILER_RT
set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ENABLE_SHARED OFF CACHE BOOL "")
set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ABI_VERSION 2 CACHE STRING "")
set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_CXX_ABI "libcxxabi" CACHE STRING "") #!!!
-set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_CXX_ABI_INCLUDE_PATHS "${LLVM_PROJECT_DIR}/libcxxabi/include" CACHE PATH "")
-set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_CXX_ABI_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib/${TOOLCHAIN_TARGET_TRIPLE}" CACHE PATH "")
set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS ON CACHE BOOL "")