diff options
| author | Tristan Ross <tristan.ross@midstall.com> | 2024-05-30 19:04:38 -0700 |
|---|---|---|
| committer | Tristan Ross <tristan.ross@midstall.com> | 2024-05-30 21:39:47 -0700 |
| commit | 77d03eb68cfb2602c5b2b8b10c214ce98648fa8a (patch) | |
| tree | 1695f95976117f9272126d7c0999c574b83105e7 /pkgs/development/compilers/llvm/common | |
| parent | 442b72ad24e2378a3c9a12c994d2084ae397789c (diff) | |
llvmPackages_{12,13,14,15,16,17,18,git}.lldb: add patch to remove origin variable
Diffstat (limited to 'pkgs/development/compilers/llvm/common')
| -rw-r--r-- | pkgs/development/compilers/llvm/common/lldb/gnu-install-dirs.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/common/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/common/lldb/gnu-install-dirs.patch index 093b9a8ba3ec3..ec550764be818 100644 --- a/pkgs/development/compilers/llvm/common/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/common/lldb/gnu-install-dirs.patch @@ -47,3 +47,22 @@ index 7d48491ec89a..c04543585588 100644 install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) +diff --git a/source/API/CMakeLists.txt b/source/API/CMakeLists.txt +index 7d48491ec89a..c04543585588 100644 +--- a/source/API/CMakeLists.txt 2024-05-30 18:59:13.449269853 -0700 ++++ b/source/API/CMakeLists.txt 2024-05-30 19:00:33.721858164 -0700 +@@ -115,14 +115,6 @@ + ${option_install_prefix} + ) + +-# lib/pythonX.Y/dist-packages/lldb/_lldb.so is a symlink to lib/liblldb.so, +-# which depends on lib/libLLVM*.so (BUILD_SHARED_LIBS) or lib/libLLVM-10git.so +-# (LLVM_LINK_LLVM_DYLIB). Add an additional rpath $ORIGIN/../../../../lib so +-# that _lldb.so can be loaded from Python. +-if(LLDB_ENABLE_PYTHON AND (BUILD_SHARED_LIBS OR LLVM_LINK_LLVM_DYLIB) AND UNIX AND NOT APPLE) +- set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "\$ORIGIN/../../../../lib${LLVM_LIBDIR_SUFFIX}") +-endif() +- + if(Python3_RPATH) + set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "${Python3_RPATH}") + set_property(TARGET liblldb APPEND PROPERTY BUILD_RPATH "${Python3_RPATH}") |