[compiler-rt] 14b2b67 - Fix locating of COMPILER_RT_LIBCXX_PATH

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2022-10-11T21:40:02-07:00
New Revision: 14b2b67cd7d5e439c4bc5c8051f68a5fbb683480

URL: https://github.com/llvm/llvm-project/commit/14b2b67cd7d5e439c4bc5c8051f68a5fbb683480
DIFF: https://github.com/llvm/llvm-project/commit/14b2b67cd7d5e439c4bc5c8051f68a5fbb683480.diff

LOG: Fix locating of COMPILER_RT_LIBCXX_PATH

COMPILER_RT_LIBCXX_PATH is required for msan unittests.

Added: 
    

Modified: 
    compiler-rt/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index fc7607ea521c..7c337977c442 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