From 2f45d197f3d6706e4bfd550a9e04ca1383d79a9b Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Fri, 14 Apr 2023 14:47:05 -0600 Subject: [PATCH] Fix rust-gdb and rust-gdbgui on FreeBSD "\w" is a GNU-specific extension to sed. Avoid it. Fixes #110334 Signed-off-by: Alan Somers --- src/etc/rust-gdb | 4 ++-- src/etc/rust-gdbgui | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb index d812f7a802b..b04930425c0 100755 --- a/src/etc/rust-gdb +++ b/src/etc/rust-gdb @@ -14,7 +14,7 @@ fi RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)" GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" # Get the commit hash for path remapping -RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \(\w*\)/\1/p')" +RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-z0-9_]*\)/\1/p')" # Run GDB with the additional arguments that load the pretty printers # Set the environment variable `RUST_GDB` to overwrite the call to a @@ -25,4 +25,4 @@ PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \ -iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \ -iex "set substitute-path /rustc/$RUSTC_COMMIT_HASH $RUSTC_SYSROOT/lib/rustlib/src/rust" \ "$@" - \ No newline at end of file + diff --git a/src/etc/rust-gdbgui b/src/etc/rust-gdbgui index e7bafcc99b8..913269316bd 100755 --- a/src/etc/rust-gdbgui +++ b/src/etc/rust-gdbgui @@ -43,7 +43,7 @@ fi RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)" GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" # Get the commit hash for path remapping -RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \(\w*\)/\1/p')" +RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')" # Set the environment variable `RUST_GDB` to overwrite the call to a # different/specific command (defaults to `gdb`).