maybe install llvm for all windows jobs?

Author: Eclips4

.github/workflows/build.yml

@@ -167,15 +167,6 @@ jobs:
       arch: ${{ matrix.arch }}
       free-threading: ${{ matrix.free-threading }}
 
-  build-windows-system-llvm:
-    name: Windows (Chocolatey LLVM)
-    needs: build-context
-    if: fromJSON(needs.build-context.outputs.run-windows-tests)
-    uses: ./.github/workflows/reusable-windows.yml
-    with:
-      arch: x64
-      llvm-from-choco: true
-
   build-windows-msi:
     # ${{ '' } is a hack to nest jobs under the same sidebar category.
     name: Windows MSI${{ '' }}  # zizmor: ignore[obfuscation]

.github/workflows/reusable-windows-msi.yml

@@ -22,15 +22,20 @@ jobs:
     env:
       ARCH: ${{ inputs.arch }}
       IncludeFreethreaded: true
-      IncludeLLVM: true
-      LIBCLANG_PATH: "${{ github.workspace }}\\externals\\llvm-21.1.4.0\\bin"
     steps:
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
     - uses: dtolnay/rust-toolchain@1.91.1
       with:
         targets: i686-pc-windows-msvc,x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
+    - name: Install LLVM for bindgen
+      shell: cmd
+      run: |
+        choco install llvm --allow-downgrade --no-progress --version 21.1.0
+        if not exist "C:\Program Files\LLVM\bin\libclang.dll" exit /b 1
+        echo LIBCLANG_PATH=C:\Program Files\LLVM\bin>> "%GITHUB_ENV%"
+        echo LLVMInstallDir=C:\Program Files\LLVM>> "%GITHUB_ENV%"
     - name: Build CPython installer
       run: ./Tools/msi/build.bat --doc -"${ARCH}"
       shell: bash

.github/workflows/reusable-windows.yml

@@ -7,11 +7,6 @@ on:
         description: CPU architecture
         required: true
         type: string
-      llvm-from-choco:
-        description: Whether to install LLVM from Chocolatey and expose LIBCLANG_PATH
-        required: false
-        type: boolean
-        default: false
       free-threading:
         description: Whether to compile CPython in free-threading mode
         required: false
@@ -37,21 +32,13 @@ jobs:
     - uses: dtolnay/rust-toolchain@1.91.1
       with:
         targets: i686-pc-windows-msvc,x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
-    - name: Install LLVM from Chocolatey
-      if: fromJSON(inputs.llvm-from-choco)
+    - name: Install LLVM for bindgen
       shell: cmd
       run: |
         choco install llvm --allow-downgrade --no-progress --version 21.1.0
         if not exist "C:\Program Files\LLVM\bin\libclang.dll" exit /b 1
-        echo IncludeLLVM=false>> "%GITHUB_ENV%"
         echo LIBCLANG_PATH=C:\Program Files\LLVM\bin>> "%GITHUB_ENV%"
         echo LLVMInstallDir=C:\Program Files\LLVM>> "%GITHUB_ENV%"
-    - name: Use bundled LLVM
-      if: ${{ !fromJSON(inputs.llvm-from-choco) }}
-      shell: cmd
-      run: |
-        echo IncludeLLVM=true>> "%GITHUB_ENV%"
-        echo LIBCLANG_PATH=%GITHUB_WORKSPACE%\externals\llvm-21.1.4.0\bin>> "%GITHUB_ENV%"
     - name: Register MSVC problem matcher
       if: inputs.arch != 'Win32'
       run: echo "::add-matcher::.github/problem-matchers/msvc.json"

PCbuild/_base64.vcxproj

@@ -126,7 +126,8 @@ if "$(Configuration)"=="Debug" (set "PY_DEBUG=1") else (set "PY_DEBUG=")
 if "$(DisableGil)"=="true" (set "PY_GIL_DISABLED=1") else (set "PY_GIL_DISABLED=")
 where cargo >NUL 2>NUL || (echo WARNING: cargo was not found on PATH, skipping _base64 & exit /b 0)
 if not "$(LibClangPath)"=="" set "LIBCLANG_PATH=$(LibClangPath)"
-if "$(LibClangPath)"=="" if not defined LIBCLANG_PATH (echo WARNING: libclang.dll was not found, skipping _base64. Install LLVM or the Visual Studio Clang tools and set LIBCLANG_PATH. & exit /b 0)
+if "$(LibClangPath)"=="" if not defined LIBCLANG_PATH (echo WARNING: libclang was not found, skipping _base64 & exit /b 0)
+if defined LIBCLANG_PATH if not exist "%LIBCLANG_PATH%\libclang.dll" if not exist "%LIBCLANG_PATH%\clang.dll" (echo WARNING: libclang.dll not found at %LIBCLANG_PATH%, skipping _base64 & exit /b 0)
 if not exist "$(CargoTargetDirNoSlash)" mkdir "$(CargoTargetDirNoSlash)"
 set "CARGO_TARGET_DIR=$(CargoTargetDirNoSlash)"
 set "PYTHON_BUILD_DIR=$(PythonBuildDir)"