From 7c6565880d9859ec75f37d6ed789b62f6db33044 Mon Sep 17 00:00:00 2001 From: Bananymous Date: Thu, 28 Dec 2023 20:16:36 +0200 Subject: [PATCH] BuildSystem: Use git apply instead of am This allows you to not have configured git user --- toolchain/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/build.sh b/toolchain/build.sh index dca571b8f0..7886997324 100755 --- a/toolchain/build.sh +++ b/toolchain/build.sh @@ -69,7 +69,7 @@ build_binutils () { if [ ! -d $BINUTILS_VERSION ]; then git clone --single-branch --branch $BINUTILS_BRANCH $BINUTILS_GIT $BINUTILS_VERSION cd $BINUTILS_VERSION - git am $BANAN_TOOLCHAIN_DIR/$BINUTILS_VERSION.patch + git apply $BANAN_TOOLCHAIN_DIR/$BINUTILS_VERSION.patch fi cd $BANAN_BUILD_DIR/toolchain/$BINUTILS_VERSION @@ -95,7 +95,7 @@ build_gcc () { if [ ! -d $GCC_VERSION ]; then git clone --single-branch --branch $GCC_BRANCH $GCC_GIT $GCC_VERSION cd $GCC_VERSION - git am $BANAN_TOOLCHAIN_DIR/$GCC_VERSION.patch + git apply $BANAN_TOOLCHAIN_DIR/$GCC_VERSION.patch fi cd $BANAN_BUILD_DIR/toolchain/$GCC_VERSION