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

diff --git a/src/etc/lldb_commands b/src/etc/lldb_commands
index f470c62d8992730b88bdfbba617d411f88a5fb19..22545e8e6c32672b06619ae53813509967027357 100644 (file)
--- 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 28b32ef1ad5328cbef7f3dbc70131d8bbd89906d..5034dd9b3f2f1edad98ffb59a3b92541dd0a1ca4 100755 (executable)
--- 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