mirror of
https://github.com/termux/termux-packages.git
synced 2025-11-01 21:59:42 +00:00
753f8b84b8
- Fixes https://github.com/termux/termux-packages/issues/26799 There is a new executable file, "`codelldb-launch`". I don't really understand exactly what it does yet, but codelldb was printing an error "unable to find codelldb-launch!" until I moved it out of the `.vsix` file and hardcoded the paths to it at `$TERMUX_PREFIX/bin`, just like I did for the `codelldb` executable, which still exists. After doing that, this bump is working on my device. I have also updated the comments about 32-bit exclusion to be accurate to the current situation. See here for more information about the problems with `codelldb` on 32-bit Android: https://github.com/termux/termux-packages/pull/25779#issuecomment-3213373449
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
Direct the extension to search for LLDB in $TERMUX_PREFIX/bin and $TERMUX_PREFIX/lib instead
|
|
of in the extension's own installation folder
|
|
|
|
--- a/extension/main.ts
|
|
+++ b/extension/main.ts
|
|
@@ -383,7 +383,7 @@ class Extension implements DebugAdapterDescriptorFactory {
|
|
if (library) {
|
|
this.liblldbPath = await adapter.findLibLLDB(library)
|
|
} else {
|
|
- this.liblldbPath = await adapter.findLibLLDB(path.join(this.context.extensionPath, 'lldb'));
|
|
+ this.liblldbPath = await adapter.findLibLLDB('@TERMUX_PREFIX@');
|
|
}
|
|
}
|
|
return this.liblldbPath;
|
|
--- a/cargo_config.unix.toml
|
|
+++ b/cargo_config.unix.toml
|
|
@@ -10,6 +10,6 @@ CXX_${LLVM_TRIPLE} = "${CMAKE_CXX_COMPILER}"
|
|
CFLAGS_${LLVM_TRIPLE} = "${CMAKE_C_FLAGS}"
|
|
CXXFLAGS_${LLVM_TRIPLE} = "${CMAKE_CXX_FLAGS}"
|
|
|
|
-LLDB_INCLUDE = "${LLDB_INCLUDE}"
|
|
-LLDB_DYLIB = "${CMAKE_BINARY_DIR}/lldb/lib/liblldb${DylibSuffix}"
|
|
+LLDB_INCLUDE = "@TERMUX_PREFIX@/include"
|
|
+LLDB_DYLIB = "@TERMUX_PREFIX@/lib/liblldb.so"
|
|
ADAPTER_SOURCE_DIR = "${CMAKE_SOURCE_DIR}/adapter"
|