[compiler-rt] bfe5e81 - Revert "Fix locating of COMPILER_RT_LIBCXX_PATH"

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2022-10-11T23:50:48-07:00
New Revision: bfe5e81826f4d98eeaa2dac08aa67bd0d7a95514

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

LOG: Revert "Fix locating of COMPILER_RT_LIBCXX_PATH"

clang-aarch64-sve-vla crashes in msan
clang-s390x-linux-lnt fails to compile libcxx

This reverts commit 14b2b67cd7d5e439c4bc5c8051f68a5fbb683480.

Added: 
    

Modified: 
    compiler-rt/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 7c337977c4429..fc7607ea521ce 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -672,8 +672,7 @@ 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})
-  endif()
-  if(NOT IS_DIRECTORY ${COMPILER_RT_LIBCXX_PATH})
+  else()
     foreach(path IN ITEMS ${LLVM_MAIN_SRC_DIR}/projects/libcxx
                           ${LLVM_MAIN_SRC_DIR}/runtimes/libcxx
                           ${LLVM_MAIN_SRC_DIR}/../libcxx