[compiler-rt] r312036 - Disable ubsan-minimal on Darwin.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Tue Aug 29 14:15:08 2017
New Revision: 312036

URL: http://llvm.org/viewvc/llvm-project?rev=312036&view=rev
Log:
Disable ubsan-minimal on Darwin.

Should un-break this bot:
http://green.lab.llvm.org/green//job/clang-stage1-configure-RA_build/38264/consoleFull

Modified:
    compiler-rt/trunk/cmake/config-ix.cmake
    compiler-rt/trunk/lib/ubsan_minimal/CMakeLists.txt
    compiler-rt/trunk/test/ubsan_minimal/lit.common.cfg

Modified: compiler-rt/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=312036&r1=312035&r2=312036&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/config-ix.cmake (original)
+++ compiler-rt/trunk/cmake/config-ix.cmake Tue Aug 29 14:15:08 2017
@@ -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)

Modified: compiler-rt/trunk/lib/ubsan_minimal/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan_minimal/CMakeLists.txt?rev=312036&r1=312035&r2=312036&view=diff
==============================================================================
--- compiler-rt/trunk/lib/ubsan_minimal/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/ubsan_minimal/CMakeLists.txt Tue Aug 29 14:15:08 2017
@@ -20,7 +20,7 @@ add_compiler_rt_object_libraries(RTUbsan
   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.

Modified: compiler-rt/trunk/test/ubsan_minimal/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan_minimal/lit.common.cfg?rev=312036&r1=312035&r2=312036&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan_minimal/lit.common.cfg (original)
+++ compiler-rt/trunk/test/ubsan_minimal/lit.common.cfg Tue Aug 29 14:15:08 2017
@@ -29,7 +29,7 @@ config.substitutions.append( ("%clangxx
 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)