[lldb/lua] Fix Lua building on Windows #83871
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add liblldb dependency and use correct extension for compiled Lua module. Replace 'Python' with 'Lua' in install path name.
|
@llvm/pr-subscribers-lldb Author: Alexander M. (amordo) ChangesAdd Replace 'Python' with 'Lua' in install path name. Fixes #55075. Full diff: https://github.com/llvm/llvm-project/pull/83871.diff 1 Files Affected:
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()
|
|
@amordo I don't know if you have commit access. Let me you need someone to press the merge button for you. |
|
@JDevlieghere I have no write access, looking for help:) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add
liblldbdependency and use correct extension for compiled Lua module.Replace 'Python' with 'Lua' in install path name.
Fixes #55075.