From: Angus Lees <gus@debian.org>
Date: Sat, 18 May 2019 19:18:25 +0000 (+0100)
Subject: Hardcode GDB python module directory
X-Git-Tag: archive/raspbian/1.33.0+dfsg1-2+rpi1^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=981c59deff319785b3add06ff960ed33ac178bea;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 23ba93da8e..dc962bf5eb 100755
--- a/src/etc/rust-gdb
+++ b/src/etc/rust-gdb
@@ -3,8 +3,10 @@
 set -e
 
 # 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