From cb7110be27b566389b1636b3ac43eb0ea8762050 Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Thu, 6 Oct 2016 16:45:40 +0000 Subject: [PATCH] [ubsan] Turn on 'Has CXXABI' to enable support for -fsanitize=vptr on Darwin Differential Revision: https://reviews.llvm.org/D24990 llvm-svn: 283466 --- compiler-rt/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 7c9baadc151f..256d74c4e0d0 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -85,6 +85,8 @@ option(COMPILER_RT_EXTERNALIZE_DEBUGINFO # COMPILER_RT_DEBUG_PYBOOL is used by lit.common.configured.in. pythonize_bool(COMPILER_RT_DEBUG) +include(config-ix) + if(APPLE AND SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.9") # Mac OS X prior to 10.9 had problems with exporting symbols from # libc++/libc++abi. @@ -102,8 +104,6 @@ pythonize_bool(SANITIZER_CAN_USE_CXXABI) # Setup Compiler Flags #================================ -include(config-ix) - if(MSVC) # Override any existing /W flags with /W4. This is what LLVM does. Failing to # remove other /W[0-4] flags will result in a warning about overriding a