summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorKamil Rytarowski <n54@gmx.com>2017-08-08 15:25:26 +0000
committerKamil Rytarowski <n54@gmx.com>2017-08-08 15:25:26 +0000
commit1445db94879de2a68c37a606acb6abfff17a6027 (patch)
treeeee551c48fa07e34d8aca96c37e1de156fbc6c3e /cmake
parent4347a8988f22c675cc42eee25db3483f530982ce (diff)
Enable COMPILER_RT_HAS_SANITIZER_COMMON on NetBSD
Summary: Temporarily keep disabled COMPILER_RT_HAS_ASAN on NetBSD. Part of the code inspired by the original work on libsanitizer in GCC 5.4 by Christos Zoulas. Sponsored by <The NetBSD Foundation> Reviewers: joerg, filcab, kcc, vitalybuka Reviewed By: vitalybuka Subscribers: srhines, mgorny, #sanitizers, llvm-commits Tags: #sanitizers Differential Revision: https://reviews.llvm.org/D36312 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@310370 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rw-r--r--cmake/config-ix.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 68c00db08..4a63674af 100644
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -470,7 +470,7 @@ set(COMPILER_RT_SANITIZERS_TO_BUILD ${ALL_SANITIZERS} CACHE STRING
list_replace(COMPILER_RT_SANITIZERS_TO_BUILD all "${ALL_SANITIZERS}")
if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
- (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|Fuchsia" OR
+ (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia" OR
(OS_NAME MATCHES "Windows" AND (NOT MINGW AND NOT CYGWIN))))
set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)
else()
@@ -483,7 +483,8 @@ else()
set(COMPILER_RT_HAS_INTERCEPTION FALSE)
endif()
-if (COMPILER_RT_HAS_SANITIZER_COMMON AND ASAN_SUPPORTED_ARCH)
+if (COMPILER_RT_HAS_SANITIZER_COMMON AND ASAN_SUPPORTED_ARCH AND
+ (NOT OS_NAME MATCHES "NetBSD"))
set(COMPILER_RT_HAS_ASAN TRUE)
else()
set(COMPILER_RT_HAS_ASAN FALSE)