From 161ae1f39816edf667aaa190bce702a86879c7bd Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Thu, 25 Jun 2020 18:28:12 -0700 Subject: [PATCH] [CMake] Add optional lldb dependency to DEBUGINFO_TEST_DEPS if(TARGET asan) is still brittle as it depends on the order of compiler-rt and debuginfo-tests in LLVM_ENABLE_PROJECTS. --- debuginfo-tests/CMakeLists.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/debuginfo-tests/CMakeLists.txt b/debuginfo-tests/CMakeLists.txt index 429e7e3..a00e3f6 100644 --- a/debuginfo-tests/CMakeLists.txt +++ b/debuginfo-tests/CMakeLists.txt @@ -22,13 +22,19 @@ set(DEBUGINFO_TEST_DEPS not ) -# llgdb-tests/asan.c and other asan* files. -if(TARGET asan) - list(APPEND DEBUGINFO_TEST_DEPS asan) +if("compiler-rt" IN_LIST LLVM_ENABLE_PROJECTS) + # llgdb-tests/asan.c and other asan* files. + if(TARGET asan) + list(APPEND DEBUGINFO_TEST_DEPS asan) + endif() + # llgdb-tests/safestack.c + if(TARGET safestack) + list(APPEND DEBUGINFO_TEST_DEPS safestack) + endif() endif() -# llgdb-tests/safestack.c -if(TARGET safestack) - list(APPEND DEBUGINFO_TEST_DEPS safestack) +# Many dexter tests depend on lldb. +if("lldb" IN_LIST LLVM_ENABLE_PROJECTS) + list(APPEND DEBUGINFO_TEST_DEPS lldb lldb-server) endif() # The Windows builder scripts pass -fuse-ld=lld. -- 2.7.4