diff options
| -rw-r--r-- | compiler-rt/cmake/config-ix.cmake | 3 | ||||
| -rw-r--r-- | compiler-rt/test/tsan/CMakeLists.txt | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 62ffa33f8b4..077ed98305c 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -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. diff --git a/compiler-rt/test/tsan/CMakeLists.txt b/compiler-rt/test/tsan/CMakeLists.txt index 1f183a41d2b..f45a6fc5912 100644 --- a/compiler-rt/test/tsan/CMakeLists.txt +++ b/compiler-rt/test/tsan/CMakeLists.txt @@ -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. |
