summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2015-06-16 18:52:28 +0000
committerPeter Collingbourne <peter@pcc.me.uk>2015-06-16 18:52:28 +0000
commita699fbae8c87945c1f65da6c836d9a0407de9893 (patch)
tree60fc9e1381566a42b6e765fed16f3db0c81e1188
parentb8270539ec977fa7866ccca894cfef4d948b3c99 (diff)
SafeStack: Adjust condition for COMPILER_RT_HAS_SAFESTACK to fix sanitizer builds.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@239840 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--cmake/config-ix.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 60dae9cf0..bfc8497c4 100644
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -337,7 +337,7 @@ if("${LLVM_NATIVE_ARCH}" STREQUAL "Mips")
set(COMPILER_RT_HAS_MSSE3_FLAG FALSE)
endif()
-if (SAFESTACK_SUPPORTED_ARCH AND
+if (COMPILER_RT_HAS_SANITIZER_COMMON AND SAFESTACK_SUPPORTED_ARCH AND
OS_NAME MATCHES "Darwin|Linux|FreeBSD")
set(COMPILER_RT_HAS_SAFESTACK TRUE)
else()