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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/msan/tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/tsan/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/msan/tests/CMakeLists.txt b/lib/msan/tests/CMakeLists.txt index 04428958e..b46023178 100644 --- a/lib/msan/tests/CMakeLists.txt +++ b/lib/msan/tests/CMakeLists.txt @@ -122,7 +122,7 @@ macro(add_msan_tests_for_arch arch kind cflags) endmacro() # We should only build MSan unit tests if we can build instrumented libcxx. -if(COMPILER_RT_CAN_EXECUTE_TESTS AND COMPILER_RT_HAS_LIBCXX_SOURCES) +if(COMPILER_RT_CAN_EXECUTE_TESTS AND COMPILER_RT_LIBCXX_PATH) foreach(arch ${MSAN_SUPPORTED_ARCH}) get_target_flags_for_arch(${arch} TARGET_CFLAGS) set(LIBCXX_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/../libcxx_msan_${arch}) diff --git a/lib/tsan/CMakeLists.txt b/lib/tsan/CMakeLists.txt index b85762bb8..3697ecb21 100644 --- a/lib/tsan/CMakeLists.txt +++ b/lib/tsan/CMakeLists.txt @@ -203,7 +203,7 @@ if(COMPILER_RT_HAS_SYSROOT_FLAG AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") endif() # Build libcxx instrumented with TSan. -if(COMPILER_RT_HAS_LIBCXX_SOURCES AND +if(COMPILER_RT_LIBCXX_PATH AND COMPILER_RT_TEST_COMPILER_ID STREQUAL "Clang" AND NOT ANDROID) set(libcxx_tsan_deps) |