From: Angus Lees <gus@debian.org>
Date: Sun, 20 Dec 2020 18:52:10 +0000 (+0000)
Subject: Hardcode GDB python module directory
X-Git-Tag: archive/raspbian/1.49.0+dfsg1-1+rpi1^2^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=24df27087929b937720a29f19a3cff1616e51299;p=rustc.git

Hardcode GDB 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-gdb-paths
---

diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
index b950cea79e..767cac8395 100755
--- a/src/etc/rust-gdb
+++ b/src/etc/rust-gdb
@@ -11,8 +11,10 @@ else
 fi
 
 # Find out where the pretty printer Python module is
-RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
+#RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
+#GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
+# We can just hardcode this on Debian, and remove the rustc dependency
+GDB_PYTHON_MODULE_DIRECTORY="/usr/share/rust-gdb"
 
 # Run GDB with the additional arguments that load the pretty printers
 # Set the environment variable `RUST_GDB` to overwrite the call to a