Build: Switch to different cross compiler tap

zjsxwc · Apr 28, 2021 · eff77bd · eff77bd
1 parent e7e3a5c
commit eff77bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,10 +24,10 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Add Linux Toolchain
-        run: brew tap MarioSchwalbe/gcc-musl-cross
+        run: brew tap FiloSottile/homebrew-musl-cross
 
       - name: Install Linux Toolchain
-        run: brew install gcc-8-musl-cross --without-armhf --without-aarch64
+        run: brew install musl-cross
         env:
           HOMEBREW_NO_INSTALL_CLEANUP: 1
           HOMEBREW_NO_AUTO_UPDATE: 1

diff --git a/build_oc.tool b/build_oc.tool
@@ -50,10 +50,10 @@ buildutil() {
       UDK_ARCH=Ia32 CC=i686-w64-mingw32-gcc STRIP=i686-w64-mingw32-strip DIST=Windows make clean || exit 1
       UDK_ARCH=Ia32 CC=i686-w64-mingw32-gcc STRIP=i686-w64-mingw32-strip DIST=Windows make -j "$cores" || exit 1
     fi
-    if [ "$(which x86_64-linux-musl-gcc-8)" != "" ]; then
+    if [ "$(which x86_64-linux-musl-gcc)" != "" ]; then
       echo "Building ${util} for Linux..."
-      STATIC=1 SUFFIX=.linux UDK_ARCH=X64 CC=x86_64-linux-musl-gcc-8 STRIP=x86_64-linux-musl-strip-8 DIST=Linux make clean || exit 1
-      STATIC=1 SUFFIX=.linux UDK_ARCH=X64 CC=x86_64-linux-musl-gcc-8 STRIP=x86_64-linux-musl-strip-8 DIST=Linux make -j "$cores" || exit 1
+      STATIC=1 SUFFIX=.linux UDK_ARCH=X64 CC=x86_64-linux-musl-gcc STRIP=x86_64-linux-musl-strip DIST=Linux make clean || exit 1
+      STATIC=1 SUFFIX=.linux UDK_ARCH=X64 CC=x86_64-linux-musl-gcc STRIP=x86_64-linux-musl-strip DIST=Linux make -j "$cores" || exit 1
     fi
     cd - || exit 1
   done