This is an archive of the discontinued LLVM Phabricator instance.

Differential D42461

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

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

Details

Reviewers
beanz
compnerd
phosek
EricWF
Commits
rG3a667b9bd8b7: [cmake] [libunwind] Call llvm_setup_rpath() when adding shared libraries.
rUNW323496: [cmake] [libunwind] Call llvm_setup_rpath() when adding shared libraries.
rL323496: [cmake] [libunwind] 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:24 PM
Herald added a subscriber: mgorny. · View Herald TranscriptJan 23 2018, 9:24 PM
hintonda added a subscriber: cfe-commits.Jan 23 2018, 9:34 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
hintonda updated this revision to Diff 131537.Jan 25 2018, 7:55 PM

Only call llvm_setup_rpath() if LLVM_FOUND is true.

Harbormaster completed remote builds in B14262: Diff 131537.Jan 25 2018, 7:57 PM
Closed by commit rL323496: [cmake] [libunwind] Call llvm_setup_rpath() when adding shared libraries. (authored by dhinton). · Explain WhyJan 25 2018, 8:04 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptJan 25 2018, 8:04 PM

Revision Contents

PathSize
libunwind/
trunk/
src/
3 lines

Diff 131538

libunwind/trunk/src/CMakeLists.txt

Show First 20 Lines • Show All 102 Lines • ▼ Show 20 Linesset_target_properties(unwind_objects
COMPILE_FLAGS "${LIBUNWIND_COMPILE_FLAGS}" COMPILE_FLAGS "${LIBUNWIND_COMPILE_FLAGS}"
POSITION_INDEPENDENT_CODE ON) POSITION_INDEPENDENT_CODE ON)
set(LIBUNWIND_TARGETS) set(LIBUNWIND_TARGETS)
# Build the shared library. # Build the shared library.
if (LIBUNWIND_ENABLE_SHARED) if (LIBUNWIND_ENABLE_SHARED)
add_library(unwind_shared SHARED $<TARGET_OBJECTS:unwind_objects>) add_library(unwind_shared SHARED $<TARGET_OBJECTS:unwind_objects>)
if(LLVM_FOUND)
llvm_setup_rpath(unwind_shared)
endif()
target_link_libraries(unwind_shared ${libraries}) target_link_libraries(unwind_shared ${libraries})
set_target_properties(unwind_shared set_target_properties(unwind_shared
PROPERTIES PROPERTIES
LINK_FLAGS "${LIBUNWIND_LINK_FLAGS}" LINK_FLAGS "${LIBUNWIND_LINK_FLAGS}"
OUTPUT_NAME "unwind" OUTPUT_NAME "unwind"
VERSION "1.0" VERSION "1.0"
SOVERSION "1") SOVERSION "1")
list(APPEND LIBUNWIND_TARGETS "unwind_shared") list(APPEND LIBUNWIND_TARGETS "unwind_shared")
Show All 35 Lines