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 b950cea79edfeaef99761ae1ab76d5cee09cf974..5ec875258b420c446114193a635665939ce748f4 100755 (executable)
--- a/src/etc/rust-gdb
+++ b/src/etc/rust-gdb
@@ -11,7 +11,7 @@ else
 fi
 
 # Find out where the pretty printer Python module is
-RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
+RUSTC_SYSROOT="$(if type "$RUSTC" >/dev/null 2>&1; then "$RUSTC" --print=sysroot; else echo /usr; fi)"
 GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
 
 # Run GDB with the additional arguments that load the pretty printers

diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui
index 590e488e643aa8612901b9b576975cd8bf1c6b1b..077890cfeaba2752240d971873ad87265151c8b4 100755 (executable)
--- a/src/etc/rust-gdbgui
+++ b/src/etc/rust-gdbgui
@@ -40,7 +40,7 @@ else
 fi
 
 # Find out where the pretty printer Python module is
-RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
+RUSTC_SYSROOT="$(if type "$RUSTC" >/dev/null 2>&1; then "$RUSTC" --print=sysroot; else echo /usr; fi)"
 GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
 
 # Set the environment variable `RUST_GDB` to overwrite the call to a