summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-rust-gdb-paths
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:37 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:37 +0000
commit2d0ec380bae2ec8d51b6193fee6577188c6bb2ec (patch)
tree00f9136b2844d7e9ddc861b845ccc309aaa6091a /debian/patches/d-rust-gdb-paths
parentMerging upstream version 1.70.0+dfsg1. (diff)
downloadrustc-2d0ec380bae2ec8d51b6193fee6577188c6bb2ec.tar.xz
rustc-2d0ec380bae2ec8d51b6193fee6577188c6bb2ec.zip
Adding debian version 1.70.0+dfsg1-7.debian/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-paths17
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')"