diff options
| author | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-02-02 16:05:52 +0000 |
|---|---|---|
| committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-02-02 16:05:52 +0000 |
| commit | 7e4cc4ab72c311074389a294b7dc682c7f5e3b0f (patch) | |
| tree | a4f103df6ac798683cb7124ecbe71fc08dfd772b /lib/tsan | |
| parent | 8e6ea7c149635562c170328003917268a8e0bcb4 (diff) | |
Revert r259512 - [tsan] Add a libc++ and lit testsuite for each ${TSAN_SUPPORTED_ARCH}.
check-tsan does not pick up the correct libc++.so. It succeeded on my machine
by picking up the libc++.so that was built before making this change.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@259519 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/tsan')
| -rw-r--r-- | lib/tsan/CMakeLists.txt | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/tsan/CMakeLists.txt b/lib/tsan/CMakeLists.txt index c185cfa16..0e60cd346 100644 --- a/lib/tsan/CMakeLists.txt +++ b/lib/tsan/CMakeLists.txt @@ -204,17 +204,10 @@ endif() # Build libcxx instrumented with TSan. if(COMPILER_RT_HAS_LIBCXX_SOURCES AND COMPILER_RT_TEST_COMPILER_ID STREQUAL "Clang") - set(libcxx_tsan_deps) - foreach(arch ${TSAN_SUPPORTED_ARCH}) - get_target_flags_for_arch(${arch} TARGET_CFLAGS) - set(LIBCXX_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libcxx_tsan_${arch}) - add_custom_libcxx(libcxx_tsan_${arch} ${LIBCXX_PREFIX} - DEPS ${TSAN_RUNTIME_LIBRARIES} - CFLAGS ${TARGET_CFLAGS} -fsanitize=thread) - list(APPEND libcxx_tsan_deps libcxx_tsan_${arch}) - endforeach() - - add_custom_target(libcxx_tsan DEPENDS ${libcxx_tsan_deps}) + set(LIBCXX_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libcxx_tsan) + add_custom_libcxx(libcxx_tsan ${LIBCXX_PREFIX} + DEPS ${TSAN_RUNTIME_LIBRARIES} + CFLAGS -fsanitize=thread) endif() if(COMPILER_RT_INCLUDE_TESTS) |