Author: zijunzhao Date: 2022-02-02T18:26:29Z New Revision: 24715c5c94775e30d40c1a8e076824466ecc2bf8
URL: https://github.com/llvm/llvm-project/commit/24715c5c94775e30d40c1a8e076824466ecc2bf8 DIFF: https://github.com/llvm/llvm-project/commit/24715c5c94775e30d40c1a8e076824466ecc2bf8.diff LOG: tsan shared lib Change-Id: I9008aa53aa051576f068bee6086f7c7a4a81aa37 Added: Modified: compiler-rt/cmake/config-ix.cmake Removed: ################################################################################ diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index eadb6013e739e..ca976e962008d 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -662,6 +662,7 @@ endif() message(STATUS "Compiler-RT supported architectures: ${COMPILER_RT_SUPPORTED_ARCH}") set(ALL_SANITIZERS asan;dfsan;msan;hwasan;tsan;safestack;cfi;scudo;ubsan_minimal;gwp_asan) + set(COMPILER_RT_SANITIZERS_TO_BUILD all CACHE STRING "sanitizers to build if supported on the target (all;${ALL_SANITIZERS})") list_replace(COMPILER_RT_SANITIZERS_TO_BUILD all "${ALL_SANITIZERS}") @@ -744,13 +745,13 @@ else() endif() if (COMPILER_RT_HAS_SANITIZER_COMMON AND TSAN_SUPPORTED_ARCH AND - OS_NAME MATCHES "Darwin|Linux|FreeBSD|Android|NetBSD") + OS_NAME MATCHES "Darwin|Linux|FreeBSD|Android|NetBSD" AND ANDROID_PLATFORM_LEVEL GREATER 23) set(COMPILER_RT_HAS_TSAN TRUE) else() set(COMPILER_RT_HAS_TSAN FALSE) endif() -if (OS_NAME MATCHES "Linux|FreeBSD|Windows|NetBSD|SunOS") +if (OS_NAME MATCHES "Linux|FreeBSD|Windows|NetBSD|SunOS" AND ANDROID_PLATFORM_LEVEL GREATER 23) set(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME TRUE) else() set(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME FALSE) _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
