From 960d73ef941fc61ebd52e64ace87b6f3a88f83ef Mon Sep 17 00:00:00 2001 From: Angus Lees Date: Tue, 8 Mar 2022 10:51:18 +0000 Subject: [PATCH] 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 --- src/etc/rust-gdb | 2 +- src/etc/rust-gdbgui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb index b950cea79e..5ec875258b 100755 --- 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 9744913b68..613737dbef 100755 --- 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 -- 2.30.2