[libcxxabi] r286334 - Revert "[CMake] Check runtimes subdir when looking for libcxx and libuwind"

[Petr Hosek via cfe-commits]

Author: phosek
Date: Tue Nov  8 21:38:21 2016
New Revision: 286334

URL: http://llvm.org/viewvc/llvm-project?rev=286334&view=rev
Log:
Revert "[CMake] Check runtimes subdir when looking for libcxx and libuwind"

This reverts commit eecb79506d88b268fb0d00cce178213b4aa17933.

Modified:
    libcxxabi/trunk/CMakeLists.txt

Modified: libcxxabi/trunk/CMakeLists.txt
URL: 
http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/CMakeLists.txt?rev=286334&r1=286333&r2=286334&view=diff
==============================================================================
--- libcxxabi/trunk/CMakeLists.txt (original)
+++ libcxxabi/trunk/CMakeLists.txt Tue Nov  8 21:38:21 2016
@@ -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_
           ${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_
     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
   )
 


_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits