[PATCH] D33178: Remove requirement for libunwind sources.

[Shiz via Phabricator via cfe-commits]

Shiz added a comment.

@EricWF: Thanks for reviewing! Is there anything else I need to do at this 
point or will it be committed automatically?


Repository:
  rL LLVM

https://reviews.llvm.org/D33178



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

[PATCH] D33178: Remove requirement for libunwind sources.

[Shiz via Phabricator via cfe-commits]

Shiz created this revision.
Herald added a subscriber: mgorny.

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.


Repository:
  rL LLVM

https://reviews.llvm.org/D33178

Files:
  libcxxabi/CMakeLists.txt


Index: libcxxabi/CMakeLists.txt
===
--- libcxxabi/CMakeLists.txt
+++ libcxxabi/CMakeLists.txt
@@ -504,21 +504,6 @@
 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 (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


Index: libcxxabi/CMakeLists.txt
===
--- libcxxabi/CMakeLists.txt
+++ libcxxabi/CMakeLists.txt
@@ -504,21 +504,6 @@
 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 (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