diff options
| author | Louis Dionne <ldionne.2@gmail.com> | 2022-08-23 09:48:36 -0400 |
|---|---|---|
| committer | Louis Dionne <ldionne.2@gmail.com> | 2022-08-23 09:58:30 -0400 |
| commit | 342e0ebd0b7409c8808a90cf38dd45ec7dc57671 (patch) | |
| tree | c836e7bd3cd5113da71861b2a5d5e7366516680b /libcxxabi/test | |
| parent | 7e24354c8ba767be65965566a9dd258703ec86c9 (diff) | |
| download | llvm-342e0ebd0b7409c8808a90cf38dd45ec7dc57671.tar.gz | |
Revert the removal of LLVM_ENABLE_PROJECTS for libc++ and libc++abi
This commit reverts the following commits:
- 952f90b72b3546d6b6b038d410f07ce520c59b48
- e6a0800532bb409f6d1c62f3698bdd6994a877dc (D132298)
- 176db3b3ab25ff8a9b2405f50ef5a8bd9304a6d5 (D132324)
These commits caused CI instability and need to be reverted in order
to figure things out again. See the discussion in https://llvm.org/D132324
for more information.
Diffstat (limited to 'libcxxabi/test')
| -rw-r--r-- | libcxxabi/test/CMakeLists.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libcxxabi/test/CMakeLists.txt b/libcxxabi/test/CMakeLists.txt index 0b82943c5a63..0a4541b9443c 100644 --- a/libcxxabi/test/CMakeLists.txt +++ b/libcxxabi/test/CMakeLists.txt @@ -61,13 +61,9 @@ if (LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY) list(APPEND LIBCXXABI_TEST_DEPS cxx_external_threads) endif() -if(libcxx IN_LIST LLVM_ENABLE_RUNTIMES) - list(APPEND LIBCXXABI_TEST_DEPS cxx) -endif() -if(libunwind IN_LIST LLVM_ENABLE_RUNTIMES) - if (LIBCXXABI_USE_LLVM_UNWINDER AND TARGET unwind) - list(APPEND LIBCXXABI_TEST_DEPS unwind) - endif() +list(APPEND LIBCXXABI_TEST_DEPS cxx) +if (LIBCXXABI_USE_LLVM_UNWINDER AND TARGET unwind) + list(APPEND LIBCXXABI_TEST_DEPS unwind) endif() set(AUTO_GEN_COMMENT "## Autogenerated by libcxxabi configuration.\n# Do not edit!") |