From 5b214197cee29a5e0bcea5f3baac8aa65c553455 Mon Sep 17 00:00:00 2001
From: Orion Hodson <orion@cloudflare.com>
Date: Fri, 1 Sep 2023 16:03:43 +0100
Subject: [PATCH] Update install-deps.bat to LLVM 16

Sync with .bazelrc changes in d9338a6c425b57999be38661133282629ade1f69
(https://github.com/cloudflare/workerd/pull/1092)

The script now installs LLVM 16.0.6 and moves the clang include dir
to match the expectations in .bazelrc. Hopefully, the .bazelrc changes
can be dropped soon, but in the interim ensure local setup and build
continues to work.
---
 tools/windows/install-deps.bat | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/windows/install-deps.bat b/tools/windows/install-deps.bat
index 8773a1724e5..bb1b5815d03 100644
--- a/tools/windows/install-deps.bat
+++ b/tools/windows/install-deps.bat
@@ -73,7 +73,11 @@ call :AddToUserPathInEnvironment C:\msys64\usr\bin
 
 echo.
 echo.* Step 7: Install LLVM compiler toolchain.
-winget install "LLVM" --version 15.0.7
+@rem workerd is tied to 16.0.6 for the time being (https://github.com/cloudflare/workerd/pull/1092).
+winget install "LLVM" --version 16.0.6
+@rem Work around for clang / bazel not agreeing on install location, will be fixed by
+@rem https://github.com/bazelbuild/bazel/pull/1939.
+move "C:\Program Files\LLVM\lib\clang\16" "C:\Program Files\LLVM\lib\clang\16.0.6"
 
 echo.
 echo.* Step 8: Install bazelisk as %LOCALAPPDATA%\Programs\bazelisk\bazel.exe.