[TSan] Use darwin_filter_host_arch to restrict set of test arch on Mac OS.

This also reverts r259577 which was a quick-fix to fix buildbots.

llvm-svn: 259593
This commit is contained in:
Alexey Samsonov 2016-02-02 22:42:25 +00:00
parent 97c01c35f8
commit e34c8e8f8a
2 changed files with 6 additions and 4 deletions

View File

@ -299,9 +299,6 @@ set(ALL_CFI_SUPPORTED_ARCH ${X86} ${X86_64})
if(APPLE)
include(CompilerRTDarwinUtils)
# tsan fails almost everything for x86_64h
list(REMOVE_ITEM ALL_TSAN_SUPPORTED_ARCH x86_64h)
# On Darwin if /usr/include doesn't exist, the user probably has Xcode but not
# the command line tools. If this is the case, we need to find the OS X
# sysroot to pass to clang.

View File

@ -16,7 +16,12 @@ endif()
set(TSAN_TESTSUITES)
foreach(arch ${TSAN_SUPPORTED_ARCH})
set(TSAN_TEST_ARCH ${TSAN_SUPPORTED_ARCH})
if(APPLE)
darwin_filter_host_archs(TSAN_SUPPORTED_ARCH TSAN_TEST_ARCH)
endif()
foreach(arch ${TSAN_TEST_ARCH})
string(TOLOWER "-${arch}" TSAN_TEST_CONFIG_SUFFIX)
if(ANDROID OR ${arch} MATCHES "arm|aarch64")
# This is only true if we are cross-compiling.