From 48c84f9596b87a96a7b22e56c4dce3adf1c489cc Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Wed, 9 Nov 2016 03:38:21 +0000 Subject: [PATCH] Revert "[CMake] Check runtimes subdir when looking for libcxx and libuwind" This reverts commit eecb79506d88b268fb0d00cce178213b4aa17933. llvm-svn: 286334 --- libcxxabi/CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index 5768bfe..dcfdf0f 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -140,10 +140,7 @@ endif() if (LLVM_EXTERNAL_LIBCXX_SOURCE_DIR) set(LIBCXXABI_LIBCXX_SRC_DIR ${LLVM_EXTERNAL_LIBCXX_SOURCE_DIR}) else() - set(LIBCXXABI_LIBCXX_SRC_DIR - "${LLVM_MAIN_SRC_DIR}/projects/libcxx" - "${LLVM_MAIN_SRC_DIR}/runtimes/libcxx" - ) + set(LIBCXXABI_LIBCXX_SRC_DIR ${LLVM_MAIN_SRC_DIR}/projects/libcxx) endif() find_path( @@ -383,7 +380,6 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM) ${LIBCXXABI_LIBUNWIND_PATH}/include ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBUNWIND_INCLUDES} ${LLVM_MAIN_SRC_DIR}/projects/libunwind/include - ${LLVM_MAIN_SRC_DIR}/runtimes/libunwind/include NO_DEFAULT_PATH ) @@ -393,7 +389,6 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM) PATHS ${LIBCXXABI_LIBUNWIND_PATH}/src/ ${LIBCXXABI_LIBUNWIND_INCLUDES}/../src/ ${LLVM_MAIN_SRC_DIR}/projects/libunwind/src/ - ${LLVM_MAIN_SRC_DIR}/runtimes/libunwind/src/ NO_DEFAULT_PATH ) -- 2.7.4