From 83701ec54b12af141ce10e910604c9e130f16f76 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Sun, 9 Apr 2023 13:23:24 +0200 Subject: [PATCH] Meta+Toolchain: Redirect GDB error output to stdout before grepping --- Meta/debug-kernel.sh | 2 +- Toolchain/BuildIt.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Meta/debug-kernel.sh b/Meta/debug-kernel.sh index 506ea79dfc..04afa992b0 100755 --- a/Meta/debug-kernel.sh +++ b/Meta/debug-kernel.sh @@ -16,7 +16,7 @@ if [ -z "$SERENITY_KERNEL_DEBUGGER" ]; then SERENITY_KERNEL_DEBUGGER="$SERENITY_ARCH-pc-serenity-gdb" elif command -v "$SERENITY_ARCH-elf-gdb" >/dev/null; then SERENITY_KERNEL_DEBUGGER="$SERENITY_ARCH-elf-gdb" - elif command -v gdb >/dev/null && gdb -ex 'set architecture' -ex 'quit' | grep "${SERENITY_ARCH//_/-}"; then + elif command -v gdb >/dev/null && gdb -ex 'set architecture' -ex 'quit' 2>&1 | grep "${SERENITY_ARCH//_/-}"; then SERENITY_KERNEL_DEBUGGER="gdb" else echo "Error: No suitable GDB installation found." >&2 diff --git a/Toolchain/BuildIt.sh b/Toolchain/BuildIt.sh index 16ea39befe..777f2685e2 100755 --- a/Toolchain/BuildIt.sh +++ b/Toolchain/BuildIt.sh @@ -103,7 +103,7 @@ buildstep() { has_gdb() { ARCH=$1 ARCH_DASH="${ARCH//_/-}" - if command -v gdb >/dev/null && gdb -ex 'set architecture' -ex 'quit' | grep "$ARCH_DASH"; then + if command -v gdb >/dev/null && gdb -ex 'set architecture' -ex 'quit' 2>&1 | grep "$ARCH_DASH"; then return 0 else command -v "$ARCH"-elf-gdb >/dev/null