Author: zijunzhao Date: 2021-12-03T01:06:30Z New Revision: 51a3a7ef89e332370cc9ae40274277ba2efe6a10
URL: https://github.com/llvm/llvm-project/commit/51a3a7ef89e332370cc9ae40274277ba2efe6a10 DIFF: https://github.com/llvm/llvm-project/commit/51a3a7ef89e332370cc9ae40274277ba2efe6a10.diff LOG: build without tsan successfully Change-Id: Ia6ac3d57caa202dbe50e0bf53733c4c6fe07027e 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 647d9d54385c..b9cc35c1167f 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -583,7 +583,7 @@ if(COMPILER_RT_SUPPORTED_ARCH) 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(ALL_SANITIZERS asan;dfsan;msan;hwasan;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}") @@ -671,12 +671,13 @@ if (COMPILER_RT_HAS_SANITIZER_COMMON AND TSAN_SUPPORTED_ARCH AND else() set(COMPILER_RT_HAS_TSAN FALSE) endif() - +set(COMPILER_RT_HAS_TSAN FALSE) if (OS_NAME MATCHES "Linux|FreeBSD|Windows|NetBSD|SunOS") set(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME TRUE) else() set(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME FALSE) endif() +set(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME FALSE) if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia|SunOS") _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits