Index: CMakeLists.txt =================================================================== --- CMakeLists.txt +++ CMakeLists.txt @@ -307,12 +307,13 @@ include_directories(include) if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM) find_path( - LIBCXXABI_LIBUNWIND_INCLUDES + LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL libunwind.h PATHS ${LIBCXXABI_LIBUNWIND_INCLUDES} ${LIBCXXABI_LIBUNWIND_PATH}/include ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBUNWIND_INCLUDES} ${LLVM_MAIN_SRC_DIR}/projects/libunwind/include + NO_DEFAULT_PATH ) find_path( @@ -329,7 +330,7 @@ set(LIBCXXABI_LIBUNWIND_SOURCES "") endif() - include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES}") + include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}") include_directories("${LIBCXXABI_LIBUNWIND_SOURCES}") endif ()