mirror of
https://github.com/termux-pacman/termux-packages.git
synced 2026-02-10 11:50:52 +00:00
8209a12290
- Fixes https://github.com/termux/termux-packages/issues/27492 - Rebase patches - Add more SBAPI removals (SBAPI removals remove compatibility with old LLDB versions that Termux does not support) - Add more patches of `process.platform == 'linux'` to `process.platform == 'android'` (`code-server` has `process.platform == 'android'`)
35 lines
1.8 KiB
Diff
35 lines
1.8 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/adapterUtils.ts
|
|
+++ b/extension/adapterUtils.ts
|
|
@@ -19,7 +19,7 @@ export async function alternateBackend(extensionPath: string) {
|
|
let lldbDir = path.resolve(path.join(dirs.supportExeDir, '..'));
|
|
let libraryPath = await adapter.findLibLLDB(lldbDir);
|
|
let serverPath;
|
|
- if (process.platform == 'linux') {
|
|
+ if (process.platform == 'linux' || process.platform == 'android') {
|
|
serverPath = await adapter.findFileByPattern(dirs.supportExeDir, /lldb-server(-.*)?/);
|
|
if (serverPath) {
|
|
let stats = await async.fs.stat(serverPath).catch(_ => null);
|
|
@@ -40,7 +40,7 @@ export async function alternateBackend(extensionPath: string) {
|
|
let message = `Located liblldb at: ${libraryPath}`;
|
|
if (serverPath)
|
|
message += `\r\nand lldb server at: ${serverPath}`;
|
|
- else if (process.platform == 'linux')
|
|
+ else if (process.platform == 'linux' || process.platform == 'android')
|
|
message += '\r\nbut did not find lldb server.';
|
|
|
|
let choice;
|
|
--- 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"
|