9f492b
--- rustc-1.61.0-src/src/etc/rust-gdb.orig	2022-05-17 18:29:36.000000000 -0700
9f492b
+++ rustc-1.61.0-src/src/etc/rust-gdb	2022-05-18 11:18:13.732709661 -0700
9f492b
@@ -14,6 +14,9 @@ fi
9f492b
 RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
9f492b
 GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
9f492b
 
9f492b
+RUST_STD_BUILD="@BUILDDIR@/library/"
9f492b
+RUST_STD_SRC="$RUSTC_SYSROOT/lib/rustlib/src/rust/library/"
9f492b
+
9f492b
 # Run GDB with the additional arguments that load the pretty printers
9f492b
 # Set the environment variable `RUST_GDB` to overwrite the call to a
9f492b
 # different/specific command (defaults to `gdb`).
9f492b
@@ -21,4 +24,5 @@ RUST_GDB="${RUST_GDB:-gdb}"
9f492b
 PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
9f492b
   --directory="$GDB_PYTHON_MODULE_DIRECTORY" \
9f492b
   -iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
9f492b
+  -iex "set substitute-path $RUST_STD_BUILD $RUST_STD_SRC" \
9f492b
   "$@"