This is an archive of the discontinued LLVM Phabricator instance.

Differential D42460

[cmake] [libcxxabi] Call llvm_setup_rpath() when adding shared libraries.
ClosedPublic

Authored by hintonda on Jan 23 2018, 9:20 PM.

Download Raw Diff

Details

Reviewers

beanz
compnerd
phosek
EricWF
smeenai

Commits

rGe3b3b8094d03: Reland: [cmake] [libcxxabi] Call llvm_setup_rpath() when adding shared…
rGbc595f570205: Revert [libcxxabi] r323455 - [cmake] [libcxxabi] Call llvm_setup_rpath() when…
rG0106b4305f1a: [cmake] [libcxxabi] Call llvm_setup_rpath() when adding shared libraries.
rCXXA323495: Reland:
rL323495: Reland:
rCXXA323458: Revert [libcxxabi] r323455 - [cmake] [libcxxabi] Call llvm_setup_rpath() when…
rL323458: Revert [libcxxabi] r323455 - [cmake] [libcxxabi] Call llvm_setup_rpath() when…
rCXXA323455: [cmake] [libcxxabi] Call llvm_setup_rpath() when adding shared libraries.
rL323455: [cmake] [libcxxabi] Call llvm_setup_rpath() when adding shared libraries.

Summary

Clang and llvm already use llvm_setup_rpath(), so this change will
help standarize rpath usage across all projects.

Diff Detail

Repository: rL LLVM

Event Timeline

hintonda created this revision.Jan 23 2018, 9:20 PM

Harbormaster completed remote builds in B14175: Diff 131196.Jan 23 2018, 9:20 PM

Herald added subscribers: cfe-commits, mgorny. · View Herald TranscriptJan 23 2018, 9:20 PM

hintonda mentioned this in D41829: [cmake] WIP: Add cache file to bootstrap linux cross compile on Darwin..Jan 23 2018, 10:12 PM

compnerd accepted this revision.Jan 24 2018, 7:49 PM

This revision is now accepted and ready to land.Jan 24 2018, 7:49 PM

Closed by commit rL323455: [cmake] [libcxxabi] Call llvm_setup_rpath() when adding shared libraries. (authored by dhinton). · Explain WhyJan 25 2018, 10:44 AM

This revision was automatically updated to reflect the committed changes.

Herald added a subscriber: llvm-commits. · View Herald TranscriptJan 25 2018, 10:44 AM

Reopen after rollback.

@smeenai pointed out LLVM may not be available in standalone builds

This revision is now accepted and ready to land.Jan 25 2018, 11:27 AM

hintonda changed the repository for this revision from rL LLVM to rCXXA libc++abi.Jan 25 2018, 11:36 AM

hintonda removed a subscriber: llvm-commits.

Only call llvm_setup_rpath() if LLVM_FOUND is true.

Closed by commit rL323495: Reland: (authored by dhinton). · Explain WhyJan 25 2018, 7:44 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

libcxxabi/

trunk/

src/

3 lines

Diff 131536

libcxxabi/trunk/src/CMakeLists.txt

	Show First 20 Lines • Show All 121 Lines • ▼ Show 20 Lines		set_target_properties(cxxabi_objects
	POSITION_INDEPENDENT_CODE			POSITION_INDEPENDENT_CODE
	ON)			ON)

	set(LIBCXXABI_TARGETS)			set(LIBCXXABI_TARGETS)

	# Build the shared library.			# Build the shared library.
	if (LIBCXXABI_ENABLE_SHARED)			if (LIBCXXABI_ENABLE_SHARED)
	add_library(cxxabi_shared SHARED $<TARGET_OBJECTS:cxxabi_objects>)			add_library(cxxabi_shared SHARED $<TARGET_OBJECTS:cxxabi_objects>)
				if(LLVM_FOUND)
				llvm_setup_rpath(cxxabi_shared)
				endif()
	target_link_libraries(cxxabi_shared ${LIBCXXABI_LIBRARIES})			target_link_libraries(cxxabi_shared ${LIBCXXABI_LIBRARIES})
	set_target_properties(cxxabi_shared			set_target_properties(cxxabi_shared
	PROPERTIES			PROPERTIES
	CXX_EXTENSIONS			CXX_EXTENSIONS
	OFF			OFF
	CXX_STANDARD			CXX_STANDARD
	11			11
	CXX_STANDARD_REQUIRED			CXX_STANDARD_REQUIRED
	▲ Show 20 Lines • Show All 67 Lines • Show Last 20 Lines