This is an archive of the discontinued LLVM Phabricator instance.

Differential D65972

Fix rpath for MacOS/iOS
ClosedPublic

Authored by hhb on Aug 8 2019, 1:48 PM.

Details

Reviewers
kongyi
JDevlieghere
Commits
rG5bb451811691: Fix rpath for MacOS/iOS
rL368398: Fix rpath for MacOS/iOS
Summary

libs can be installed to ../lib64.

Diff Detail

Event Timeline

hhb created this revision.Aug 8 2019, 1:48 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 8 2019, 1:48 PM
Herald added subscribers: llvm-commits, mgorny. · View Herald Transcript
Harbormaster completed remote builds in B36460: Diff 214225.Aug 8 2019, 1:48 PM
hhb added a reviewer: kongyi.Aug 8 2019, 2:40 PM
hhb added a reviewer: JDevlieghere.Aug 8 2019, 2:43 PM
hhb updated this revision to Diff 214266.Aug 8 2019, 5:30 PM

Change title

hhb retitled this revision from Fix rpath for MacOS to Fix rpath for MacOS/iOS.Aug 8 2019, 5:31 PM
Harbormaster completed remote builds in B36479: Diff 214266.Aug 8 2019, 5:33 PM
JDevlieghere accepted this revision.Aug 8 2019, 10:19 PM

Good catch, thanks!

This revision is now accepted and ready to land.Aug 8 2019, 10:19 PM
Closed by commit rL368398: Fix rpath for MacOS/iOS (authored by hhb). · Explain WhyAug 8 2019, 11:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
cmake/
modules/
2 lines

Diff 214225

llvm/cmake/modules/AddLLVM.cmake

Show First 20 Lines • Show All 1,729 Lines • ▼ Show 20 Linesfunction(llvm_setup_rpath name)
if(LLVM_INSTALL_PREFIX AND NOT (LLVM_INSTALL_PREFIX STREQUAL CMAKE_INSTALL_PREFIX)) if(LLVM_INSTALL_PREFIX AND NOT (LLVM_INSTALL_PREFIX STREQUAL CMAKE_INSTALL_PREFIX))
set(extra_libdir ${LLVM_LIBRARY_DIR}) set(extra_libdir ${LLVM_LIBRARY_DIR})
elseif(LLVM_BUILD_LIBRARY_DIR) elseif(LLVM_BUILD_LIBRARY_DIR)
set(extra_libdir ${LLVM_LIBRARY_DIR}) set(extra_libdir ${LLVM_LIBRARY_DIR})
endif() endif()
if (APPLE) if (APPLE)
set(_install_name_dir INSTALL_NAME_DIR "@rpath") set(_install_name_dir INSTALL_NAME_DIR "@rpath")
set(_install_rpath "@loader_path/../lib" ${extra_libdir}) set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
elseif(UNIX) elseif(UNIX)
set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
set_property(TARGET ${name} APPEND_STRING PROPERTY set_property(TARGET ${name} APPEND_STRING PROPERTY
LINK_FLAGS " -Wl,-z,origin ") LINK_FLAGS " -Wl,-z,origin ")
endif() endif()
if(LLVM_LINKER_IS_GNULD) if(LLVM_LINKER_IS_GNULD)
# $ORIGIN is not interpreted at link time by ld.bfd # $ORIGIN is not interpreted at link time by ld.bfd
▲ Show 20 Lines • Show All 64 Lines • Show Last 20 Lines