From 81b6386c8735dfce95fd42b644376a5c291d837c Mon Sep 17 00:00:00 2001 From: James Mintram Date: Fri, 1 Apr 2022 00:06:48 +0100 Subject: [PATCH] Toolchain: Fix the gdb build for aarch64 target on macOS host --- Toolchain/BuildIt.sh | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/Toolchain/BuildIt.sh b/Toolchain/BuildIt.sh index cf04b665ee..8b33fc2da7 100755 --- a/Toolchain/BuildIt.sh +++ b/Toolchain/BuildIt.sh @@ -308,12 +308,31 @@ pushd "$DIR/Build/$ARCH" pushd gdb echo "XXX configure gdb" - buildstep "gdb/configure" "$DIR"/Tarballs/$GDB_NAME/configure --prefix="$PREFIX" \ - --target="$TARGET" \ - --with-sysroot="$SYSROOT" \ - --enable-shared \ - --disable-nls \ - ${TRY_USE_LOCAL_TOOLCHAIN:+"--quiet"} || exit 1 + + + if [ "$SYSTEM_NAME" = "Darwin" ]; then + buildstep "gdb/configure" "$DIR"/Tarballs/$GDB_NAME/configure --prefix="$PREFIX" \ + --target="$TARGET" \ + --with-sysroot="$SYSROOT" \ + --enable-shared \ + --disable-werror \ + --with-libgmp-prefix="$(brew --prefix gmp)" \ + --with-gmp="$(brew --prefix gmp)" \ + --with-isl="$(brew --prefix isl)" \ + --with-mpc="$(brew --prefix libmpc)" \ + --with-mpfr="$(brew --prefix mpfr)" \ + --disable-nls \ + ${TRY_USE_LOCAL_TOOLCHAIN:+"--quiet"} || exit 1 + else + buildstep "gdb/configure" "$DIR"/Tarballs/$GDB_NAME/configure --prefix="$PREFIX" \ + --target="$TARGET" \ + --with-sysroot="$SYSROOT" \ + --enable-shared \ + --disable-nls \ + ${TRY_USE_LOCAL_TOOLCHAIN:+"--quiet"} || exit 1 + fi + + echo "XXX build gdb" buildstep "gdb/build" "$MAKE" -j "$MAKEJOBS" || exit 1 buildstep "gdb/install" "$MAKE" install || exit 1