Author: ericwf
Date: Wed May 31 17:11:42 2017
New Revision: 304359
URL: http://llvm.org/viewvc/llvm-project?rev=304359&view=rev
Log:
Remove requirement for libunwind sources. Patch by Shiz.
As per r241993, libunwind_ext.h is not used anymore, and thus only the public
libunwind includes are needed.
This eases distro packaging efforts and removes an unneeded requirement for
out-of-tree building.
Reviewed as D33178
Modified:
libcxxabi/trunk/CMakeLists.txt
Modified: libcxxabi/trunk/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/CMakeLists.txt?rev=304359&r1=304358&r2=304359&view=diff
==============================================================================
--- libcxxabi/trunk/CMakeLists.txt (original)
+++ libcxxabi/trunk/CMakeLists.txt Wed May 31 17:11:42 2017
@@ -504,21 +504,6 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_
NO_DEFAULT_PATH
)
- find_path(
- LIBCXXABI_LIBUNWIND_SOURCES
- libunwind_ext.h
- 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
- )
-
- if (LIBCXXABI_LIBUNWIND_SOURCES STREQUAL
"LIBCXXABI_LIBUNWIND_SOURCES-NOTFOUND")
- message(WARNING "LIBCXXABI_LIBUNWIND_SOURCES was not specified and
couldn't be infered.")
- set(LIBCXXABI_LIBUNWIND_SOURCES "")
- endif()
-
if (LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL STREQUAL
"LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL-NOTFOUND")
set(LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL "")
endif()
@@ -526,10 +511,6 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_
if (NOT LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL STREQUAL "")
include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}")
endif()
-
- if (NOT LIBCXXABI_LIBUNWIND_SOURCES STREQUAL "")
- include_directories("${LIBCXXABI_LIBUNWIND_SOURCES}")
- endif()
endif()
# Add source code. This also contains all of the logic for deciding linker
flags
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
