From: Angus Lees <gus@debian.org>
Date: Tue, 29 Mar 2022 11:23:46 +0000 (+0100)
Subject: Hardcode LLDB python module directory
X-Git-Tag: archive/raspbian/1.59.0+dfsg1-1_deb11u3+rpi1~1^2^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1a6878a503d1a0169f6a79b907c4acc4fd9d6fe4;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..793f5938b 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" >/dev/null 2>&1; then "$RUSTC" --print=sysroot; else echo /usr; fi)"
 RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
 
-lldb=lldb
+lldb=lldb-13
 if [ -f "$RUST_LLDB" ]; then
     lldb="$RUST_LLDB"
 else