From: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Date: Wed, 19 Apr 2017 20:47:18 +0000 (+0100)
Subject: d-rust-gdb-paths
X-Git-Tag: archive/raspbian/1.17.0+dfsg2-8+rpi1~2^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=791b8c32225d68df9b3505a610317f6b314f3340;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 520a108da9..6f7d4117f8 100755
--- a/src/etc/rust-gdb
+++ b/src/etc/rust-gdb
@@ -13,11 +13,13 @@
 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
-PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" gdb \
+PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec gdb \
   -d "$GDB_PYTHON_MODULE_DIRECTORY" \
   -iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
   "$@"