summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2017-08-29 21:15:08 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2017-08-29 21:15:08 +0000
commit8140e686727334160666888918bba735b197dcf3 (patch)
tree69fb3ec8662f6ee1d335510119b20509150fe43f
parent04d0769c4c9fe8e3204424cfc5368b4a78006d03 (diff)
Disable ubsan-minimal on Darwin.
Should un-break this bot: http://green.lab.llvm.org/green//job/clang-stage1-configure-RA_build/38264/consoleFull git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@312036 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--cmake/config-ix.cmake2
-rw-r--r--lib/ubsan_minimal/CMakeLists.txt2
-rw-r--r--test/ubsan_minimal/lit.common.cfg2
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index c53715f53..d5ef46e25 100644
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -546,7 +546,7 @@ else()
endif()
if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND
- OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Android")
+ OS_NAME MATCHES "Linux|FreeBSD|NetBSD|Android")
set(COMPILER_RT_HAS_UBSAN_MINIMAL TRUE)
else()
set(COMPILER_RT_HAS_UBSAN_MINIMAL FALSE)
diff --git a/lib/ubsan_minimal/CMakeLists.txt b/lib/ubsan_minimal/CMakeLists.txt
index c75f5090a..adc5d184d 100644
--- a/lib/ubsan_minimal/CMakeLists.txt
+++ b/lib/ubsan_minimal/CMakeLists.txt
@@ -20,7 +20,7 @@ add_compiler_rt_object_libraries(RTUbsan_minimal
SOURCES ${UBSAN_MINIMAL_SOURCES} CFLAGS ${UBSAN_CFLAGS})
-if(COMPILER_RT_HAS_UBSAN)
+if(COMPILER_RT_HAS_UBSAN_MINIMAL)
# Initializer of standalone UBSan runtime.
# Standalone UBSan runtimes.
diff --git a/test/ubsan_minimal/lit.common.cfg b/test/ubsan_minimal/lit.common.cfg
index 1bd1bbefe..df0643cd7 100644
--- a/test/ubsan_minimal/lit.common.cfg
+++ b/test/ubsan_minimal/lit.common.cfg
@@ -29,7 +29,7 @@ config.substitutions.append( ("%clangxx ", build_invocation(clang_ubsan_cxxflags
config.suffixes = ['.c', '.cc', '.cpp']
# Check that the host supports UndefinedBehaviorSanitizerMinimal tests
-if config.host_os not in ['Darwin', 'Linux', 'FreeBSD', 'NetBSD']: # TODO: Windows
+if config.host_os not in ['Linux', 'FreeBSD', 'NetBSD']: # TODO: Darwin, Windows
config.unsupported = True
config.available_features.add('arch=' + config.target_arch)