diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-05-31 22:11:42 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-05-31 22:11:42 +0000 |
| commit | 27db230ab05a685268b94f7296a99d380ab04611 (patch) | |
| tree | 5c5cb69eb4e6ffe37f5c1535bbc4bdefc1ac1f58 /libcxxabi | |
| parent | 8514dd540d4c98b152c74b6e88a7413893151a21 (diff) | |
| download | llvm-27db230ab05a685268b94f7296a99d380ab04611.zip llvm-27db230ab05a685268b94f7296a99d380ab04611.tar.gz llvm-27db230ab05a685268b94f7296a99d380ab04611.tar.bz2 | |
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
llvm-svn: 304359
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/CMakeLists.txt | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index 90ef7c6..07ad0c6 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -504,21 +504,6 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM) 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_NATIVE_ARCH MATCHES ARM) 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 |