diff options
| author | Petr Hosek <phosek@chromium.org> | 2017-12-12 01:20:52 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2017-12-12 01:20:52 +0000 |
| commit | eff015538b70adcb9f3976ac8d2181513e28c1c1 (patch) | |
| tree | 8ba95e68041087146a1ae57a941f47da8af4e706 /test | |
| parent | 9b3f7c3d180b156605b9def01ce16465baee9c1c (diff) | |
[CMake] Support runtimes and monorepo layouts when looking for libcxx
This also slightly refactors the code that's checking the directory
presence which allows eliminating one unnecessary variable.
Differential Revision: https://reviews.llvm.org/D40637
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@320446 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
| -rw-r--r-- | test/msan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/tsan/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/msan/CMakeLists.txt b/test/msan/CMakeLists.txt index 171bcb961..b4532cfc9 100644 --- a/test/msan/CMakeLists.txt +++ b/test/msan/CMakeLists.txt @@ -25,7 +25,7 @@ if(NOT COMPILER_RT_STANDALONE_BUILD) list(APPEND MSAN_TEST_DEPS msan) endif() -if(COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_HAS_LIBCXX_SOURCES) +if(COMPILER_RT_INCLUDE_TESTS AND COMPILER_RT_LIBCXX_PATH) configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg) diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt index af329562d..2b1d3004b 100644 --- a/test/tsan/CMakeLists.txt +++ b/test/tsan/CMakeLists.txt @@ -7,7 +7,7 @@ endif() if(NOT COMPILER_RT_STANDALONE_BUILD) list(APPEND TSAN_TEST_DEPS tsan) endif() -if(COMPILER_RT_HAS_LIBCXX_SOURCES AND +if(COMPILER_RT_LIBCXX_PATH AND COMPILER_RT_TEST_COMPILER_ID STREQUAL "Clang" AND NOT APPLE AND NOT ANDROID) list(APPEND TSAN_TEST_DEPS libcxx_tsan) |