summaryrefslogtreecommitdiffstats
path: root/compiler-rt
diff options
context:
space:
mode:
authorKuba Brecka <kuba.brecka@gmail.com>2015-11-12 11:00:38 +0000
committerKuba Brecka <kuba.brecka@gmail.com>2015-11-12 11:00:38 +0000
commit14fb164a8e0fa3a7561d2d088b4355c4eb38ba78 (patch)
treeea00dc70ac3f545088669d2af07b1eec34c787ee /compiler-rt
parent57207ce922305ae2cedafa7a605dc6f8b39fdcd5 (diff)
downloadbcm5719-llvm-14fb164a8e0fa3a7561d2d088b4355c4eb38ba78.tar.gz
bcm5719-llvm-14fb164a8e0fa3a7561d2d088b4355c4eb38ba78.zip
[tsan] Filter OS X architectures for unit testing
The TSan unit test build currently fails if we're also building the iOS parts of compiler-rt, because `TSAN_SUPPORTED_ARCH` contains ARM64. For unit tests, we need to filter this only to host architecture(s). Differential Revision: http://reviews.llvm.org/D14604 llvm-svn: 252873
Diffstat (limited to 'compiler-rt')
-rw-r--r--compiler-rt/lib/tsan/tests/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler-rt/lib/tsan/tests/CMakeLists.txt b/compiler-rt/lib/tsan/tests/CMakeLists.txt
index 9cce2798aec..51181bab3a7 100644
--- a/compiler-rt/lib/tsan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/tsan/tests/CMakeLists.txt
@@ -33,8 +33,12 @@ macro(tsan_compile obj_list source arch)
endmacro()
macro(add_tsan_unittest testname)
+ set(TSAN_TEST_ARCH ${TSAN_SUPPORTED_ARCH})
+ if(APPLE)
+ darwin_filter_host_archs(TSAN_SUPPORTED_ARCH TSAN_TEST_ARCH)
+ endif()
if(UNIX)
- foreach(arch ${TSAN_SUPPORTED_ARCH})
+ foreach(arch ${TSAN_TEST_ARCH})
cmake_parse_arguments(TEST "" "" "SOURCES;HEADERS" ${ARGN})
set(TEST_OBJECTS)
foreach(SOURCE ${TEST_SOURCES} ${COMPILER_RT_GTEST_SOURCE})
OpenPOWER on IntegriCloud