diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:20:40 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:20:40 +0000 |
commit | b667bd04d7a0062c0e3fc07f480f5d66c55c0014 (patch) | |
tree | ae99acd0647b6bcb5fe608adaa66995139eb146e /debian/patches/d-rust-gdb-paths | |
parent | Merging upstream version 1.70.0+dfsg1. (diff) | |
download | rustc-b667bd04d7a0062c0e3fc07f480f5d66c55c0014.tar.xz rustc-b667bd04d7a0062c0e3fc07f480f5d66c55c0014.zip |
Merging debian version 1.70.0+dfsg1-7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-rust-gdb-paths')
-rw-r--r-- | debian/patches/d-rust-gdb-paths | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/debian/patches/d-rust-gdb-paths b/debian/patches/d-rust-gdb-paths index 4be3024ea..119365af3 100644 --- a/debian/patches/d-rust-gdb-paths +++ b/debian/patches/d-rust-gdb-paths @@ -13,19 +13,6 @@ just hardcode path in wrapper script. diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb index b950cea..5ec8752 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 9744913..613737d 100755 --- a/src/etc/rust-gdbgui +++ b/src/etc/rust-gdbgui @@ -40,7 +40,7 @@ else @@ -35,5 +22,5 @@ index 9744913..613737d 100755 -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 + # Get the commit hash for path remapping + RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')" |