diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 81f5c2b..789a573 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -99,7 +99,7 @@ jobs: - name: Build toolchain run: | - brew reinstall ninja zstd binutils + brew reinstall ninja zstd binutils gpatch ./build.sh clone build mkdir tmp tar c out | xz --x86 --lzma2 > tmp/out.x64.tar.xz @@ -127,7 +127,7 @@ jobs: - name: Build toolchain run: | - brew reinstall ninja zstd binutils + brew reinstall ninja zstd binutils gpatch ./build.sh clone build mkdir tmp tar c out | xz > tmp/out.arm64.tar.xz diff --git a/build.sh b/build.sh index ec4283d..3d046eb 100755 --- a/build.sh +++ b/build.sh @@ -23,6 +23,8 @@ if [ $OS = "darwin" ]; then NATIVE_TRIPLE="${NATIVE_ARCH}-apple-darwin" DYN_EXT='dylib' EXE_FMT='Mach-O' + # Always use GNU patch + export PATH="$(brew --prefix)/opt/gpatch/bin:$PATH" else NDK_DIRNAME='linux-x86_64' TRIPLE="${ARCH}-unknown-linux-gnu"