From: Angus Lees <gus@debian.org>
Date: Thu, 14 Jul 2022 11:17:39 +0000 (+0200)
Subject: Hardcode LLDB python module directory
X-Git-Tag: archive/raspbian/1.78.0+dfsg1-2+rpi1^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=15933e8c25a2232d9911337287e3625a2e4a1b7a;p=rustc.git

Hardcode LLDB python module directory

Debian package installs python modules into a fixed directory, so
just hardcode path in wrapper script.

Forwarded: not-needed

Gbp-Pq: Topic behaviour
Gbp-Pq: Name d-rust-lldb-paths.patch
---

diff --git a/src/etc/rust-lldb b/src/etc/rust-lldb
index bce72f1bad..38e76c2109 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-17
 if [ -f "$RUST_LLDB" ]; then
     lldb="$RUST_LLDB"
 else