[compiler-rt] r239840 - SafeStack: Adjust condition for COMPILER_RT_HAS_SAFESTACK to fix sanitizer builds.

[Peter Collingbourne]

Author: pcc
Date: Tue Jun 16 13:52:28 2015
New Revision: 239840

URL: http://llvm.org/viewvc/llvm-project?rev=239840&view=rev
Log:
SafeStack: Adjust condition for COMPILER_RT_HAS_SAFESTACK to fix sanitizer builds.

Modified:
    compiler-rt/trunk/cmake/config-ix.cmake

Modified: compiler-rt/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=239840&r1=239839&r2=239840&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/config-ix.cmake (original)
+++ compiler-rt/trunk/cmake/config-ix.cmake Tue Jun 16 13:52:28 2015
@@ -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()