[PATCH] D72459: [CMake] Support running libc++abi tests in CrossWinToARMLinux cache file

[Sergej Jaskiewicz via Phabricator via cfe-commits]

broadwaylamb created this revision.
Herald added subscribers: cfe-commits, ldionne, kristof.beyls, mgorny.
Herald added a reviewer: EricWF.
Herald added a project: clang.
broadwaylamb edited the summary of this revision.
broadwaylamb edited reviewers, added: andreil99, vvereschaka, aorlov; removed: EricWF.
broadwaylamb edited the summary of this revision.

Now that D71894 <https://reviews.llvm.org/D71894> has landed, we're able to run libc++abi tests remotely.

For that we can use the same CMake command as before. The tests can be run using `ninja check-cxxabi`.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D72459

Files:
  clang/cmake/caches/CrossWinToARMLinux.cmake


Index: clang/cmake/caches/CrossWinToARMLinux.cmake
===================================================================
--- clang/cmake/caches/CrossWinToARMLinux.cmake
+++ clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -76,10 +76,13 @@
 set(LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS OFF CACHE BOOL "")
 set(LIBCXXABI_TARGET_TRIPLE                 "${CMAKE_C_COMPILER_TARGET}" CACHE STRING "")
 set(LIBCXXABI_SYSROOT                       "${DEFAULT_SYSROOT}" CACHE STRING "")
+set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXABI OFF CACHE BOOL "")
+set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXX    OFF CACHE BOOL "")
 
 set(LIBCXX_USE_COMPILER_RT                  ON CACHE BOOL "")
 set(LIBCXX_TARGET_TRIPLE                    "${CMAKE_C_COMPILER_TARGET}" CACHE STRING "")
 set(LIBCXX_SYSROOT                          "${DEFAULT_SYSROOT}" CACHE STRING "")
+set(LIBCXX_ENABLE_SHARED                    OFF CACHE BOOL "")
 
 set(BUILTINS_CMAKE_ARGS                     "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
 set(RUNTIMES_CMAKE_ARGS                     "-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D72459.237095.patch
Type: text/x-patch
Size: 1138 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200109/096ea949/attachment.bin>