[llvm-branch-commits] [libcxxabi] e879b2b - [libcxxabi] [test] Depend on unwind only if available

Tom Stellard via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Tue Mar 8 21:34:29 PST 2022


Author: Michał Górny
Date: 2022-03-08T21:33:47-08:00
New Revision: e879b2bf82ef2d096d2c0e5147ebac541a7b8828

URL: https://github.com/llvm/llvm-project/commit/e879b2bf82ef2d096d2c0e5147ebac541a7b8828
DIFF: https://github.com/llvm/llvm-project/commit/e879b2bf82ef2d096d2c0e5147ebac541a7b8828.diff

LOG: [libcxxabi] [test] Depend on unwind only if available

When building libcxxabi via LLVM_ENABLE_RUNTIMES=libcxxabi the CMake
invocation fails because of missing "unwind" target.  However,
if the extraneous dependency is removed, the library builds just fine
against installed libunwind and tests work fine.  To fix this,
add the dependency only if the target actually exists.

Differential Revision: https://reviews.llvm.org/D119538

(cherry picked from commit 5244ef0faf5595495c1adedfa16c346d35caebdf)

Added: 
    

Modified: 
    libcxxabi/test/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxxabi/test/CMakeLists.txt b/libcxxabi/test/CMakeLists.txt
index 6baaf40ca7b11..57b5fccab8008 100644
--- a/libcxxabi/test/CMakeLists.txt
+++ b/libcxxabi/test/CMakeLists.txt
@@ -63,7 +63,7 @@ endif()
 
 if (NOT LIBCXXABI_STANDALONE_BUILD)
   list(APPEND LIBCXXABI_TEST_DEPS cxx)
-  if (LIBCXXABI_USE_LLVM_UNWINDER)
+  if (LIBCXXABI_USE_LLVM_UNWINDER AND TARGET unwind)
     list(APPEND LIBCXXABI_TEST_DEPS unwind)
   endif()
 endif()


        


More information about the llvm-branch-commits mailing list