From 03de2cbb2ebbd5db6f1711b0fabc6defea781309 Mon Sep 17 00:00:00 2001 From: Angus Lees Date: Sat, 29 Aug 2020 16:54:36 +0100 Subject: [PATCH] Hardcode LLDB python module directory Forwarded: not-needed Debian package installs python modules into a fixed directory, so just hardcode path in wrapper script. Gbp-Pq: Name d-rust-lldb-paths --- src/etc/lldb_commands | 2 +- src/etc/rust-lldb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/etc/lldb_commands b/src/etc/lldb_commands index f470c62d89..22545e8e6c 100644 --- a/src/etc/lldb_commands +++ b/src/etc/lldb_commands @@ -1,4 +1,4 @@ -command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_lookup.py\" +command script import \"/usr/share/rust-lldb/lldb_lookup.py\" type synthetic add -l lldb_lookup.synthetic_lookup -x \".*\" --category Rust type summary add -F lldb_lookup.summary_lookup -e -x -h \"^(alloc::([a-z_]+::)+)String$\" --category Rust type summary add -F lldb_lookup.summary_lookup -e -x -h \"^&str$\" --category Rust diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb index 28b32ef1ad..5034dd9b3f 100755 --- a/src/etc/rust-lldb +++ b/src/etc/rust-lldb @@ -10,7 +10,7 @@ host=$(rustc -vV | sed -n -e 's/^host: //p') RUSTC_SYSROOT=$(rustc --print sysroot) RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb" -lldb=lldb +lldb=lldb-10 if [ -f "$RUST_LLDB" ]; then lldb="$RUST_LLDB" else -- 2.30.2