diff --git a/.github/workflows/build-mesa.yml b/.github/workflows/build-mesa.yml
index 91532408..7e0d6d80 100644
--- a/.github/workflows/build-mesa.yml
+++ b/.github/workflows/build-mesa.yml
@@ -45,22 +45,24 @@ jobs:
       - name: Fetch LLVM
         run: |
           git clone -b release/19.x --depth 1 https://github.com/llvm/llvm-project.git llvm-project
-      - name: Build LLVM
+      - name: Build LLVM (Windows)
+        if: ${{ matrix.os == 'windows-2022' }}
         run: |
           cd llvm-project/llvm
           mkdir build
           cd build
           cmake .. -G Ninja -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD="AArch64;X86"
           ninja
-      - name: Install LLVM
-        shell: bash
+          ninja install
+      - name: Build LLVM (non-Windows)
+        if: ${{ matrix.os != 'windows-2022' }}
         run: |
-          cd llvm-project/llvm/build
-          if [ "$RUNNER_OS" == "Windows" ]; then
-            ninja install
-          else
-            sudo $(which ninja) install
-          fi
+          cd llvm-project/llvm
+          mkdir build
+          cd build
+          cmake .. -G Ninja -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_BUILD_TYPE=Release -DLLVM_TARGETS_TO_BUILD="AArch64;X86" -DBUILD_SHARED_LIBS=ON
+          ninja
+          sudo $(which ninja) install
       - name: Fetch Mesa
         run: |
           git clone -b main --depth 1 https://gitlab.freedesktop.org/mesa/mesa.git mesa