From 4727b5bd4d94fc7c295bcf4d8635e6f3605c2306 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Sun, 27 Mar 2022 12:47:35 +0100 Subject: [PATCH] Meta: Fix path to GCC's addr2line in serenity.sh I'm not sure when this changed, but the path is wildly different now. --- Meta/serenity.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Meta/serenity.sh b/Meta/serenity.sh index 41317b7063..84d73a4559 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -410,7 +410,7 @@ if [[ "$CMD" =~ ^(build|install|image|copy-src|run|gdb|test|rebuild|recreate|kad if [ "$TOOLCHAIN_TYPE" = "Clang" ]; then ADDR2LINE="$TOOLCHAIN_DIR/bin/llvm-addr2line" else - ADDR2LINE="$TOOLCHAIN_DIR/binutils/binutils/addr2line" + ADDR2LINE="$TOOLCHAIN_DIR/bin/$TARGET-pc-serenity-addr2line" fi "$ADDR2LINE" -e "$BUILD_DIR/Kernel/Kernel" "$@" ;; @@ -425,7 +425,7 @@ if [[ "$CMD" =~ ^(build|install|image|copy-src|run|gdb|test|rebuild|recreate|kad elif [ "$TOOLCHAIN_TYPE" = "Clang" ]; then ADDR2LINE="$TOOLCHAIN_DIR/bin/llvm-addr2line" else - ADDR2LINE="$TOOLCHAIN_DIR/binutils/binutils/addr2line" + ADDR2LINE="$TOOLCHAIN_DIR/bin/$TARGET-pc-serenity-addr2line" fi if [ -x "$BINARY_FILE_PATH" ]; then "$ADDR2LINE" -e "$BINARY_FILE_PATH" "$@"