nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 08:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #70713 - jsgf:rust-gdb-rustc, r=Mark-Simulacrum

Browse Source 
Prefer sysroot from rustc in same directory as rust-gdb

If there isn't a rustc in the same directory, then fall back to searching
the path.
This commit is contained in:
Mazdak Farrokhzad 2020-04-06 04:24:18 +02:00 committed by GitHub
commit 4911d168d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/etc/rust-gdb
View File

@ -2,8 +2,16 @@
# Exit if anything fails
set -e
# 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"
# Run GDB with the additional arguments that load the pretty printers

10
src/etc/rust-gdbgui
View File

@ -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