From 14b2b67cd7d5e439c4bc5c8051f68a5fbb683480 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Wed, 28 Sep 2022 18:53:39 -0700 Subject: [PATCH] Fix locating of COMPILER_RT_LIBCXX_PATH COMPILER_RT_LIBCXX_PATH is required for msan unittests. --- compiler-rt/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index fc7607e..7c33797 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -672,7 +672,8 @@ if(COMPILER_RT_USE_LIBCXX) # Don't use libcxx if LLVM_ENABLE_PROJECTS does not enable it. set(COMPILER_RT_LIBCXX_PATH ${LLVM_EXTERNAL_LIBCXX_SOURCE_DIR}) set(COMPILER_RT_LIBCXXABI_PATH ${LLVM_EXTERNAL_LIBCXXABI_SOURCE_DIR}) - else() + endif() + if(NOT IS_DIRECTORY ${COMPILER_RT_LIBCXX_PATH}) foreach(path IN ITEMS ${LLVM_MAIN_SRC_DIR}/projects/libcxx ${LLVM_MAIN_SRC_DIR}/runtimes/libcxx ${LLVM_MAIN_SRC_DIR}/../libcxx -- 2.7.4