pyrox.dev
1diff --git a/bindings/lua/CMakeLists.txt b/bindings/lua/CMakeLists.txt
2index 1a739a980..59f8fc3a0 100644
3--- a/bindings/lua/CMakeLists.txt
4+++ b/bindings/lua/CMakeLists.txt
5@@ -56,7 +56,7 @@ function(finish_swig_lua swig_target lldb_lua_bindings_dir lldb_lua_target_dir)
6 if(LLDB_BUILD_FRAMEWORK)
7 set(LLDB_LUA_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python)
8 else()
9- set(LLDB_LUA_INSTALL_PATH ${LLDB_LUA_RELATIVE_PATH})
10+ set(LLDB_LUA_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_LUA_RELATIVE_PATH})
11 endif()
12 install(DIRECTORY ${lldb_lua_target_dir}/
13 DESTINATION ${LLDB_LUA_INSTALL_PATH}
14diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
15index c631faf52ac3..1d92d069960b 100644
16--- a/bindings/python/CMakeLists.txt
17+++ b/bindings/python/CMakeLists.txt
18@@ -160,7 +160,7 @@ function(finish_swig_python swig_target lldb_python_bindings_dir lldb_python_tar
19 if(LLDB_BUILD_FRAMEWORK)
20 set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Versions/${LLDB_FRAMEWORK_VERSION}/Resources/Python)
21 else()
22- set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH})
23+ set(LLDB_PYTHON_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH})
24 endif()
25 if (NOT CMAKE_CFG_INTDIR STREQUAL ".")
26 string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH})
27diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
28index 3291a7c808e1..b27d27ce6a87 100644
29--- a/cmake/modules/AddLLDB.cmake
30+++ b/cmake/modules/AddLLDB.cmake
31@@ -109,7 +109,7 @@ function(add_lldb_library name)
32 endif()
33
34 if(PARAM_SHARED)
35- set(install_dest lib${LLVM_LIBDIR_SUFFIX})
36+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
37 if(PARAM_INSTALL_PREFIX)
38 set(install_dest ${PARAM_INSTALL_PREFIX})
39 endif()
40diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
41index 7d48491ec89a..c04543585588 100644
42--- a/tools/intel-features/CMakeLists.txt
43+++ b/tools/intel-features/CMakeLists.txt
44@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED
45 )
46
47 install(TARGETS lldbIntelFeatures
48- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
49+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
50diff --git a/source/API/CMakeLists.txt b/source/API/CMakeLists.txt
51index 7d48491ec89a..c04543585588 100644
52--- a/source/API/CMakeLists.txt 2024-05-30 18:59:13.449269853 -0700
53+++ b/source/API/CMakeLists.txt 2024-05-30 19:00:33.721858164 -0700
54@@ -115,14 +115,6 @@
55 ${option_install_prefix}
56 )
57
58-# lib/pythonX.Y/dist-packages/lldb/_lldb.so is a symlink to lib/liblldb.so,
59-# which depends on lib/libLLVM*.so (BUILD_SHARED_LIBS) or lib/libLLVM-10git.so
60-# (LLVM_LINK_LLVM_DYLIB). Add an additional rpath $ORIGIN/../../../../lib so
61-# that _lldb.so can be loaded from Python.
62-if(LLDB_ENABLE_PYTHON AND (BUILD_SHARED_LIBS OR LLVM_LINK_LLVM_DYLIB) AND UNIX AND NOT APPLE)
63- set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "\$ORIGIN/../../../../lib${LLVM_LIBDIR_SUFFIX}")
64-endif()
65-
66 if(Python3_RPATH)
67 set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH "${Python3_RPATH}")
68 set_property(TARGET liblldb APPEND PROPERTY BUILD_RPATH "${Python3_RPATH}")