From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Wed, 9 Aug 2017 02:49:55 +0000 (+0100)
Subject: d-rust-gdb-paths
X-Git-Tag: archive/raspbian/1.19.0+dfsg3-4+rpi1^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=92f0b28945699d4af40f07d0fab7eb96406d342a;p=rustc.git

d-rust-gdb-paths


Gbp-Pq: Name d-rust-gdb-paths
---

diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
index 52601cd96f..66ecbca798 100755
--- a/src/etc/rust-gdb
+++ b/src/etc/rust-gdb
@@ -13,14 +13,16 @@
 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
 # different/specific command (defaults to `gdb`).
 RUST_GDB="${RUST_GDB:-gdb}"
-PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" ${RUST_GDB} \
+PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
   -d "$GDB_PYTHON_MODULE_DIRECTORY" \
   -iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
   "$@"