mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-18 05:39:58 +00:00
2a0c7bd88d
ba34cbad41
moved the location of the handling for _lldb.so in the python bindings,
which we delete in gnu-install-dirs.patch. to allow the patch to apply
to lldb 23, we make the patch version dependent and move the deletion to
the new location in the source for the llvm 23 version.
65 lines
3.1 KiB
Diff
65 lines
3.1 KiB
Diff
diff --git a/bindings/lua/CMakeLists.txt b/bindings/lua/CMakeLists.txt
|
|
index f4ca6bb5f9cb..2355eb159d98 100644
|
|
--- a/bindings/lua/CMakeLists.txt
|
|
+++ b/bindings/lua/CMakeLists.txt
|
|
@@ -61,7 +61,7 @@ function(finish_swig_lua swig_target lldb_lua_bindings_dir lldb_lua_target_dir)
|
|
if(LLDB_BUILD_FRAMEWORK)
|
|
set(LLDB_LUA_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Lua)
|
|
else()
|
|
- set(LLDB_LUA_INSTALL_PATH ${LLDB_LUA_RELATIVE_PATH})
|
|
+ set(LLDB_LUA_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_LUA_RELATIVE_PATH})
|
|
endif()
|
|
install(DIRECTORY ${lldb_lua_target_dir}/
|
|
DESTINATION ${LLDB_LUA_INSTALL_PATH}
|
|
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
|
|
index d29b143c1408..8ce045f7fa1f 100644
|
|
--- a/bindings/python/CMakeLists.txt
|
|
+++ b/bindings/python/CMakeLists.txt
|
|
@@ -197,7 +197,7 @@ function(finish_swig_python swig_target lldb_python_bindings_dir lldb_python_tar
|
|
if(LLDB_BUILD_FRAMEWORK)
|
|
set(LLDB_PYTHON_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Versions/${LLDB_FRAMEWORK_VERSION}/Resources/Python)
|
|
else()
|
|
- set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH})
|
|
+ set(LLDB_PYTHON_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH})
|
|
endif()
|
|
if (NOT CMAKE_CFG_INTDIR STREQUAL ".")
|
|
string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH})
|
|
@@ -248,14 +248,6 @@ function(add_python_wrapper target)
|
|
add_dependencies(${target} swig_wrapper_python)
|
|
add_swig_wrapper(${target} ${lldb_python_wrapper})
|
|
|
|
- # 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 ${target} APPEND PROPERTY INSTALL_RPATH "\$ORIGIN/../../../../lib${LLVM_LIBDIR_SUFFIX}")
|
|
- endif()
|
|
-
|
|
if(Python3_RPATH)
|
|
set_property(TARGET ${target} APPEND PROPERTY INSTALL_RPATH "${Python3_RPATH}")
|
|
set_property(TARGET ${target} APPEND PROPERTY BUILD_RPATH "${Python3_RPATH}")
|
|
diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake
|
|
index b6ad8d46380b..02c5f9806295 100644
|
|
--- a/cmake/modules/AddLLDB.cmake
|
|
+++ b/cmake/modules/AddLLDB.cmake
|
|
@@ -329,7 +329,7 @@ function(add_lldb_library name)
|
|
endif()
|
|
|
|
if(PARAM_SHARED)
|
|
- set(install_dest lib${LLVM_LIBDIR_SUFFIX})
|
|
+ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|
|
if(PARAM_INSTALL_PREFIX)
|
|
set(install_dest ${PARAM_INSTALL_PREFIX})
|
|
endif()
|
|
diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt
|
|
index 7d48491ec89a..c04543585588 100644
|
|
--- a/tools/intel-features/CMakeLists.txt
|
|
+++ b/tools/intel-features/CMakeLists.txt
|
|
@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED
|
|
)
|
|
|
|
install(TARGETS lldbIntelFeatures
|
|
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX})
|