diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml
index 22aa1065d44b..7666dfdcf2c7 100644
--- a/.github/workflows/cross-bootstrap-tools.yml
+++ b/.github/workflows/cross-bootstrap-tools.yml
@@ -1,57 +1,57 @@
 name: Cross-build Kernel
 
 on:
   push:
     branches: [ main, 'stable/13' ]
   pull_request:
     branches: [ main ]
 
 jobs:
   build:
     name: ${{ matrix.os }} (${{ matrix.compiler }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
           # TODO: both Ubuntu and macOS have bmake packages, we should try them instead of bootstrapping our own copy.
           - os: ubuntu-20.04
             compiler: clang-9
             cross-bindir: /usr/lib/llvm-9/bin
             pkgs: bmake libarchive-dev clang-9 lld-9
           - os: ubuntu-20.04
             compiler: clang-10
             cross-bindir: /usr/lib/llvm-10/bin
             pkgs: bmake libarchive-dev clang-10 lld-10
-          - os: macOS-latest
-            compiler: clang-11
+          - os: macos-latest
+            compiler: clang-12
+            cross-bindir: /usr/local/opt/llvm/bin
             pkgs: bmake libarchive
-
     steps:
       - uses: actions/checkout@v2
       - name: install packages (Ubuntu)
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update --quiet || true
           sudo apt-get -yq --no-install-suggests --no-install-recommends install ${{ matrix.pkgs }}
       - name: install packages (macOS)
         if: runner.os == 'macOS'
         run: |
           brew update --quiet || true
           brew install ${{ matrix.pkgs }} || true
       - name: create environment
         run: |
           echo "GITHUB_WORKSPACE = $GITHUB_WORKSPACE"
           if [ -n "${{ matrix.cross-bindir }}" ]; then
             echo "EXTRA_BUILD_ARGS=--cross-bindir=${{ matrix.cross-bindir }}" >> $GITHUB_ENV
           fi
           mkdir -p ../build
           echo "MAKEOBJDIRPREFIX=${PWD%/*}/build" >> $GITHUB_ENV
           # heh, works on Linux/BSD/macOS ...
           echo "NPROC=`getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1`" >> $GITHUB_ENV
       - name: bootstrap bmake
         run: ./tools/build/make.py --debug $EXTRA_BUILD_ARGS TARGET=amd64 TARGET_ARCH=amd64 -n
       - name: make kernel-toolchain
         run: ./tools/build/make.py --debug $EXTRA_BUILD_ARGS TARGET=amd64 TARGET_ARCH=amd64 kernel-toolchain -s -j$NPROC
       - name: make buildkernel
         run: ./tools/build/make.py --debug $EXTRA_BUILD_ARGS TARGET=amd64 TARGET_ARCH=amd64 KERNCONF=GENERIC NO_MODULES=yes buildkernel -s -j$NPROC $EXTRA_MAKE_ARGS