Use GNU patch on macOS

topjohnwu · Sep 14, 2024 · 43ace8a · 43ace8a
1 parent 1e58729
commit 43ace8a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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"