Fix locating of COMPILER_RT_LIBCXX_PATH
authorVitaly Buka <vitalybuka@google.com>
Thu, 29 Sep 2022 01:53:39 +0000 (18:53 -0700)
committerVitaly Buka <vitalybuka@google.com>
Wed, 12 Oct 2022 04:40:02 +0000 (21:40 -0700)
COMPILER_RT_LIBCXX_PATH is required for msan unittests.

compiler-rt/CMakeLists.txt

index fc7607e..7c33797 100644 (file)
@@ -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