[libunwind] r294556 - Revert "[libunwind][CMake] Use libc++ headers when available"

Petr Hosek via cfe-commits cfe-commits at lists.llvm.org
Wed Feb 8 19:56:48 PST 2017


Author: phosek
Date: Wed Feb  8 21:56:47 2017
New Revision: 294556

URL: http://llvm.org/viewvc/llvm-project?rev=294556&view=rev
Log:
Revert "[libunwind][CMake] Use libc++ headers when available"

This is causing build failure when building libc++abi with libunwind.

This reverts commit 42bf29501dfa79f211841de060386d539933e811.

Modified:
    libunwind/trunk/CMakeLists.txt

Modified: libunwind/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libunwind/trunk/CMakeLists.txt?rev=294556&r1=294555&r2=294556&view=diff
==============================================================================
--- libunwind/trunk/CMakeLists.txt (original)
+++ libunwind/trunk/CMakeLists.txt Wed Feb  8 21:56:47 2017
@@ -282,23 +282,4 @@ endif()
 
 include_directories(include)
 
-find_path(
-  LIBUNWIND_LIBCXX_INCLUDES_INTERNAL
-  __libcpp_version
-  PATHS ${LLVM_MAIN_SRC_DIR}/projects/libcxx/include
-        ${LLVM_MAIN_SRC_DIR}/runtimes/libcxx/include
-  NO_DEFAULT_PATH
-)
-if ((NOT LIBUNWIND_STANDALONE_BUILD OR HAVE_LIBCXX) AND
-    IS_DIRECTORY "${LIBUNWIND_LIBCXX_INCLUDES_INTERNAL}")
-  set(LIBUNWIND_CXX_INCLUDE_PATHS_DEFAULT "${LIBUNWIND_LIBCXX_INCLUDES_INTERNAL}")
-endif()
-
-set(LIBUNWIND_CXX_INCLUDE_PATHS "${LIBUNWIND_CXX_INCLUDE_PATHS_DEFAULT}" CACHE PATH
-    "Paths to C++ header directories separated by ';'.")
-
-if (NOT LIBUNWIND_CXX_INCLUDE_PATHS STREQUAL "")
-  include_directories("${LIBUNWIND_CXX_INCLUDE_PATHS}")
-endif()
-
 add_subdirectory(src)




More information about the cfe-commits mailing list