Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BuildSystem: Use git apply instead of am 

This allows you to not have configured git user
This commit is contained in:
Bananymous 2023-12-28 20:16:36 +02:00
parent 93a72ebd06
commit 7c6565880d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolchain/build.sh
View File

@ -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