Auto merge of #80746 - ehuss:update-cargo, r=ehuss

[rust.git] / src / etc / rust-gdbgui

diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui
index 08d598cde1c3d1ccb32306eee2650ec886df7f5d..9744913b686501d83f864bd1c5b2d8674f9cd913 100755 (executable)
--- a/src/etc/rust-gdbgui
+++ b/src/etc/rust-gdbgui
@@ -31,8 +31,16 @@ icon to start your program running.
     exit 0
 fi
 
+# Prefer rustc in the same directory as this script
+DIR="$(dirname "$0")"
+if [ -x "$DIR/rustc" ]; then
+  RUSTC="$DIR/rustc"
+else
+  RUSTC="rustc"
+fi
+
 # Find out where the pretty printer Python module is
-RUSTC_SYSROOT=`rustc --print=sysroot`
+RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
 GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
 
 # Set the environment variable `RUST_GDB` to overwrite the call to a