diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d82a5d8..80c4121 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -179,12 +179,12 @@ jobs:
           TAG: ${{needs.prepare.outputs.TAG}}
         run: |
           brew install ninja
-          # Building with MACOS_REDIST=1 (building universal binaries) without
-          # --disable-lldb fails in Github Actions, because python is available
-          # (and gets picked up), but only exists in native form.
-          # Disable use of zstd too - it's also available, but only in native
-          # form.
-          MACOS_REDIST=1 LLVM_CMAKEFLAGS="-DLLVM_ENABLE_ZSTD=OFF" ./build-all.sh $(pwd)/install/llvm-mingw --disable-clang-tools-extra --disable-lldb
+          # Disable zstd and python. Both are available on the runners, but
+          # installed with homebrew, and only available in the native (x86_64)
+          # form. Therefore, autodetection will pick them up, but linking
+          # universal binaries fails as those libraries are unavailable in the
+          # other (arm64) architecture form.
+          MACOS_REDIST=1 LLVM_CMAKEFLAGS="-DLLVM_ENABLE_ZSTD=OFF -DLLDB_ENABLE_PYTHON=OFF" ./build-all.sh $(pwd)/install/llvm-mingw --disable-clang-tools-extra
           .github/workflows/store-version.sh install/llvm-mingw/versions.txt
           cd install
           NAME=llvm-mingw-$TAG-ucrt-macos-universal