[PATCH] D65972: Fix rpath for MacOS/iOS

Haibo Huang via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Thu Aug 8 23:05:14 PDT 2019


This revision was automatically updated to reflect the committed changes.
Closed by commit rL368398: Fix rpath for MacOS/iOS (authored by hhb, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D65972?vs=214266&id=214303#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D65972/new/

https://reviews.llvm.org/D65972

Files:
  llvm/trunk/cmake/modules/AddLLVM.cmake


Index: llvm/trunk/cmake/modules/AddLLVM.cmake
===================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake
+++ llvm/trunk/cmake/modules/AddLLVM.cmake
@@ -1735,7 +1735,7 @@
 
   if (APPLE)
     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)
     set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
     if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65972.214303.patch
Type: text/x-patch
Size: 595 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190809/dd386f23/attachment.bin>


More information about the llvm-commits mailing list