diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index f6d48b3..26b6d8e 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -186,13 +186,15 @@ filter_available_targets(PROFILE_SUPPORTED_ARCH x86_64 i386 i686 arm mips mips64 filter_available_targets(TSAN_SUPPORTED_ARCH x86_64) filter_available_targets(UBSAN_SUPPORTED_ARCH x86_64 i386 i686 arm aarch64 mips mipsel mips64 mips64el) +string(REGEX MATCH "musl[^-]*$" LLVM_ENV_MUSL ${LLVM_HOST_TRIPLE}) + if(ANDROID) set(OS_NAME "Android") else() set(OS_NAME "${CMAKE_SYSTEM_NAME}") endif() -if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND +if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND NOT LLVM_ENV_MUSL AND (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD" OR (OS_NAME MATCHES "Windows" AND MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 4))) set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE) diff --git a/lib/Makefile.mk b/lib/Makefile.mk index ed9690d..28e17d9 100644 --- a/lib/Makefile.mk +++ b/lib/Makefile.mk @@ -10,13 +10,14 @@ SubDirs := # Add submodules. -SubDirs += asan +#SubDirs += asan SubDirs += builtins -SubDirs += dfsan +#SubDirs += dfsan SubDirs += interception -SubDirs += lsan -SubDirs += msan +#SubDirs += lsan +#SubDirs += msan SubDirs += profile -SubDirs += sanitizer_common -SubDirs += tsan -SubDirs += ubsan +#SubDirs += sanitizer_common +#SubDirs += tsan +#SubDirs += ubsan + -- 2.1.4