From: Angus Lees <gus@debian.org>
Date: Sun, 19 Sep 2021 18:48:33 +0000 (+0100)
Subject: Hardcode LLDB python module directory
X-Git-Tag: archive/raspbian/1.59.0+dfsg1-1_deb11u3+rpi1~2^2^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d7d07f346083b76b999475c7c1f49670755740d1;p=rustc-mozilla.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 bce72f1ba..763afb8ac 100755
--- a/src/etc/rust-lldb
+++ b/src/etc/rust-lldb
@@ -7,10 +7,10 @@ set -e
 host=$(rustc -vV | sed -n -e 's/^host: //p')
 
 # Find out where to look for the pretty printer Python module
-RUSTC_SYSROOT=$(rustc --print sysroot)
+RUSTC_SYSROOT="$(if type "$RUSTC" 2>/dev/null; then "$RUSTC" --print=sysroot; else echo /usr; fi)"
 RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
 
-lldb=lldb
+lldb=lldb-11
 if [ -f "$RUST_LLDB" ]; then
     lldb="$RUST_LLDB"
 else