From: Angus Lees <gus@debian.org>
Date: Sun, 5 Jul 2020 14:06:52 +0000 (+0100)
Subject: Hardcode LLDB python module directory
X-Git-Tag: archive/raspbian/1.43.0+dfsg1-1+rpi1^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=703fa4edf61f84e7ef08a8fd13fc7eedfa0511df;p=rustc.git

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/rust-lldb b/src/etc/rust-lldb
index 7b9b40e6b4..e73d151173 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-9
 if [ -f "$RUST_LLDB" ]; then
     lldb="$RUST_LLDB"
 else
@@ -31,7 +31,7 @@ EOF
 fi
 
 # Prepare commands that will be loaded before any file on the command line has been loaded
-script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\""
+script_import="command script import \"$RUSTC_SYSROOT/share/rust-lldb/lldb_rust_formatters.py\""
 category_definition="type summary add --no-value --python-function lldb_rust_formatters.print_val -x \".*\" --category Rust"
 category_enable="type category enable Rust"