This is an archive of the discontinued LLVM Phabricator instance.

Remove requirement for libunwind sources.
ClosedPublic

Authored by Shiz on May 14 2017, 7:54 PM.

Download Raw Diff

Details

Reviewers

Summary

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.

Diff Detail

Repository: rL LLVM

Event Timeline

Shiz created this revision.May 14 2017, 7:54 PM

Herald added a subscriber: mgorny. · View Herald TranscriptMay 14 2017, 7:54 PM

EricWF accepted this revision.May 25 2017, 12:40 AM

This revision is now accepted and ready to land.May 25 2017, 12:40 AM

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

EricWF mentioned this in rL304359: Remove requirement for libunwind sources. Patch by Shiz..May 31 2017, 3:12 PM

Committed as r304359.

Revision Contents

Path

Size

libcxxabi/

CMakeLists.txt

19 lines

Diff 98940

libcxxabi/CMakeLists.txt

Context not available.
	NO_DEFAULT_PATH	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")	if (LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL STREQUAL "LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL-NOTFOUND")
	set(LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL "")	set(LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL "")
	endif()	endif()
Context not available.
	if (NOT LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL STREQUAL "")	if (NOT LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL STREQUAL "")
	include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}")	include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}")
	endif()	endif()

	if (NOT LIBCXXABI_LIBUNWIND_SOURCES STREQUAL "")
	include_directories("${LIBCXXABI_LIBUNWIND_SOURCES}")
	endif()
	endif()	endif()

	# Add source code. This also contains all of the logic for deciding linker flags	# Add source code. This also contains all of the logic for deciding linker flags
Context not available.