From 3cef099ceddccefca8e11268624397cde9e04af6 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Wed, 11 Jun 2025 01:06:13 +0000 Subject: [PATCH] [TySan][CMake] Depend on tysan for check-tysan in runtimes build (#143597) The runtimes build expects libclang_rt.tysan.a to be available, but the check-tysan target does not actually depend on it when built using a runtimes build with LLVM_ENABLE_RUNTIMES pointing at ./llvm. This means we get test failures when running check-compiler-rt due to the missing static archive. This patch also makes check-tysan depend on tysan when we are using the runtimes build. This is causing premerge failures currently since we recently migrated to the runtimes build. --- compiler-rt/test/tysan/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/compiler-rt/test/tysan/CMakeLists.txt b/compiler-rt/test/tysan/CMakeLists.txt index 76f57501e854..ce0afa8769f0 100644 --- a/compiler-rt/test/tysan/CMakeLists.txt +++ b/compiler-rt/test/tysan/CMakeLists.txt @@ -21,9 +21,7 @@ foreach(arch ${TYSAN_TEST_ARCH}) endforeach() set(TYSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS}) -if(NOT COMPILER_RT_STANDALONE_BUILD) - list(APPEND TYSAN_TEST_DEPS tysan) -endif() +list(APPEND TYSAN_TEST_DEPS tysan) add_lit_testsuite(check-tysan "Running the TypeSanitizer tests" ${TYSAN_TESTSUITES}