From 00be099c794f21abd23b6e1c6b75bf152ca969ed Mon Sep 17 00:00:00 2001
From: Ian Grunert <ian.grunert@gmail.com>
Date: Thu, 9 Apr 2026 20:54:58 -0400
Subject: [PATCH] Update LLVM 21.1.0 -> 21.1.8

21.1.0 has issues in StdLibExtras.h switchOn, but it looks like bun is
compiling successfully with 21.1.8.
---
 buildbot-worker/BuildbotWorker/Run-BuildbotWorker.ps1 | 7 +------
 msbuild-2022/Dockerfile                               | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/buildbot-worker/BuildbotWorker/Run-BuildbotWorker.ps1 b/buildbot-worker/BuildbotWorker/Run-BuildbotWorker.ps1
index 92e1edf5..770fa0a4 100644
--- a/buildbot-worker/BuildbotWorker/Run-BuildbotWorker.ps1
+++ b/buildbot-worker/BuildbotWorker/Run-BuildbotWorker.ps1
@@ -78,12 +78,7 @@ Make sure the amount of disk space is set in the storage-opts setting of the dae
 Write-Host 'Initializing Visual Studio environment';
 Initialize-VSEnvironment -Architecture 'amd64' -Path (Get-VSBuildTools2022VCVarsAllPath);
 
-if ($env:COMPILER -eq 'Clang') {
-  $compilerExe = 'clang-cl.exe';
-} else {
-  $compilerExe = 'cl.exe';
-}
-
+$compilerExe = 'clang-cl.exe';
 $compilerPath = (Get-Command $compilerExe).Path;
 
 Write-Host ('Found compiler at {0}' -f $compilerPath);
diff --git a/msbuild-2022/Dockerfile b/msbuild-2022/Dockerfile
index 6f641130..1b0d1485 100644
--- a/msbuild-2022/Dockerfile
+++ b/msbuild-2022/Dockerfile
@@ -21,7 +21,7 @@ RUN Install-VSBuildTools2022 -InstallationPath C:\MSVS -Workloads `
 # Install LLVM for Clang tooling support
 #--------------------------------------------------------------------
 
-ENV LLVM_VERSION 21.1.0
+ENV LLVM_VERSION 21.1.8
 
 RUN Install-LLVM -Version $env:LLVM_VERSION -InstallationPath C:\LLVM;