Skip to content

Commit 79e8f29

Browse files
authored
[lldb/lua] Fix Lua building on Windows (#83871)
Add `liblldb` dependency and use correct extension for compiled Lua module. Replace 'Python' with 'Lua' in install path name. Fixes #55075.
1 parent abe4677 commit 79e8f29

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

lldb/bindings/lua/CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,15 @@ endfunction()
2828
function(finish_swig_lua swig_target lldb_lua_bindings_dir lldb_lua_target_dir)
2929
add_custom_target(${swig_target} ALL VERBATIM
3030
COMMAND ${CMAKE_COMMAND} -E make_directory ${lldb_lua_target_dir}
31-
DEPENDS swig_wrapper_lua
31+
DEPENDS swig_wrapper_lua liblldb
3232
COMMENT "LLDB Lua API")
3333
if(LLDB_BUILD_FRAMEWORK)
3434
set(LIBLLDB_SYMLINK_DEST "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/LLDB")
3535
else()
3636
set(LIBLLDB_SYMLINK_DEST "${LLVM_SHLIB_OUTPUT_INTDIR}/liblldb${CMAKE_SHARED_LIBRARY_SUFFIX}")
3737
endif()
3838
if(WIN32)
39-
if(CMAKE_BUILD_TYPE STREQUAL Debug)
40-
set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb_d.pyd")
41-
else()
42-
set(LIBLLDB_SYMLINK_OUTPUT_FILE "_lldb.pyd")
43-
endif()
39+
set(LIBLLDB_SYMLINK_OUTPUT_FILE "lldb.dll")
4440
else()
4541
set(LIBLLDB_SYMLINK_OUTPUT_FILE "lldb.so")
4642
endif()
@@ -54,7 +50,7 @@ function(finish_swig_lua swig_target lldb_lua_bindings_dir lldb_lua_target_dir)
5450
add_dependencies(lldb ${swig_target})
5551

5652
if(LLDB_BUILD_FRAMEWORK)
57-
set(LLDB_LUA_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Python)
53+
set(LLDB_LUA_INSTALL_PATH ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/Resources/Lua)
5854
else()
5955
set(LLDB_LUA_INSTALL_PATH ${LLDB_LUA_RELATIVE_PATH})
6056
endif()

0 commit comments

Comments
 (0)