diff options
| author | Petr Hosek <phosek@chromium.org> | 2016-11-09 03:38:21 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2016-11-09 03:38:21 +0000 |
| commit | 48c84f9596b87a96a7b22e56c4dce3adf1c489cc (patch) | |
| tree | d338f6f216dc97e3c7484e1d473b1a2710709ab8 /libcxxabi | |
| parent | 260952ed1a9f9b9aa3b009f6c1f45bae742c2dbe (diff) | |
| download | bcm5719-llvm-48c84f9596b87a96a7b22e56c4dce3adf1c489cc.tar.gz bcm5719-llvm-48c84f9596b87a96a7b22e56c4dce3adf1c489cc.zip | |
Revert "[CMake] Check runtimes subdir when looking for libcxx and libuwind"
This reverts commit eecb79506d88b268fb0d00cce178213b4aa17933.
llvm-svn: 286334
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/CMakeLists.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index 5768bfe7c27..dcfdf0f550d 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 ) |
