https://github.com/amordo created
https://github.com/llvm/llvm-project/pull/83871
Add `liblldb` dependency and use correct extension for compiled Lua module.
Replace 'Python' with 'Lua' in install path name.
Fixes #55075.
>From 678ea6f6e6234b72c93f2c5e5323f76cdf252377 Mon Sep 17 00:00:00 2001
From: Alexander Mordovskiy <iammo...@gmail.com>
Date: Mon, 4 Mar 2024 17:41:31 +0100
Subject: [PATCH] [lldb/lua] Fix Lua building on Windows
Add liblldb dependency and use correct extension for compiled Lua module.
Replace 'Python' with 'Lua' in install path name.
---
lldb/bindings/lua/CMakeLists.txt | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/lldb/bindings/lua/CMakeLists.txt b/lldb/bindings/lua/CMakeLists.txt
index 1a739a9805ec8a..2d128cc1864c87 100644
--- a/lldb/bindings/lua/CMakeLists.txt
+++ b/lldb/bindings/lua/CMakeLists.txt
@@ -28,7 +28,7 @@ endfunction()
function(finish_swig_lua swig_target lldb_lua_bindings_dir lldb_lua_target_dir)
add_custom_target(${swig_target} ALL VERBATIM
COMMAND ${CMAKE_COMMAND} -E make_directory ${lldb_lua_target_dir}
- DEPENDS swig_wrapper_lua
+ DEPENDS swig_wrapper_lua liblldb
COMMENT "LLDB Lua API")
if(LLDB_BUILD_FRAMEWORK)
set(LIBLLDB_SYMLINK_DEST
"${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/LLDB")
@@ -36,11 +36,7 @@ function(finish_swig_lua swig_target lldb_lua_bindings_dir
lldb_lua_target_dir)
set(LIBLLDB_SYMLINK_DEST
"${LLVM_SHLIB_OUTPUT_INTDIR}/liblldb${CMAKE_SHARED_LIBRARY_SUFFIX}")
endif()
if(WIN32)
- if(CMAKE_BUILD_TYPE STREQUAL Debug)
- set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb_d.pyd")
- else()
- set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb.pyd")
- endif()
+ set(LIBLLDB_SYMLINK_OUTPUT_FILE "lldb.dll")
else()
set(LIBLLDB_SYMLINK_OUTPUT_FILE "lldb.so")
endif()
@@ -54,7 +50,7 @@ function(finish_swig_lua swig_target lldb_lua_bindings_dir
lldb_lua_target_dir)
add_dependencies(lldb ${swig_target})
if(LLDB_BUILD_FRAMEWORK)
- set(LLDB_LUA_INSTALL_PATH
${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python)
+ set(LLDB_LUA_INSTALL_PATH
${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Lua)
else()
set(LLDB_LUA_INSTALL_PATH ${LLDB_LUA_RELATIVE_PATH})
endif()
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
