From 79f57f84aabd4ba146c83ace44ec4a404dea9b7e Mon Sep 17 00:00:00 2001
From: Felix Hanau <felix@cloudflare.com>
Date: Thu, 5 Oct 2023 13:01:33 -0400
Subject: [PATCH] Update to bazel 6.4.0, drop Windows workaround

---
 .bazelrc                      | 13 -------------
 .bazelversion                 |  2 +-
 .github/workflows/release.yml |  2 --
 .github/workflows/test.yml    |  2 --
 WORKSPACE                     |  2 +-
 5 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 2d2fba96b3c..e87b91f76df 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -177,19 +177,6 @@ build:windows --copt='-Wno-unused-command-line-argument' --host_copt='-Wno-unuse
 # set the correct value. We currently don't check __cplusplus, but some dependencies do.
 build:windows --cxxopt='/Zc:__cplusplus' --host_cxxopt='/Zc:__cplusplus'
 
-# The following are required on github runners temporarily due to
-# https://github.com/actions/runner-images/issues/8125
-# For reasons TBD, clang in LLVM 16 is including the MSFT version emmintrin.h in
-# preference to the very packaged in LLVM 16 when compiling these files. The compiler
-# command-line and environment set by Bazel is the same, modulo the LLVM version
-# strings.
-build:windows --per_file_copt='external/ssl/src/crypto/fipsmodule/bcm.\c@-imsvcC:\\Program Files\\LLVM\\lib\\clang\\16.0.6\\include' --host_per_file_copt='external/ssl/src/crypto/fipsmodule/bcm\.c@-imsvcC:\\Program Files\\LLVM\\lib\\clang\\16.0.6\\include'
-build:windows --per_file_copt='external/ssl/src/crypto/hrss/hrss\.c@-imsvcC:\\Program Files\\LLVM\\lib\\clang\\16.0.6\\include' --host_per_file_copt='external/ssl/src/crypto/hrss/hrss\.c@-imsvcC:\\Program Files\\LLVM\\lib\\clang\\16.0.6\\include'
-build:windows --per_file_copt='external/ssl/src/crypto/poly1305/poly1305_vec\.c@-imsvcC:\\Program Files\\LLVM\\lib\\clang\\16.0.6\\include' --host_per_file_copt='external/ssl/src/crypto/poly1305/poly1305_vec.c@-imsvcC:\\Program Files\\LLVM\\lib\\clang\\16.0.6\\include'
-build:windows --per_file_copt='external/v8/src/objects/literal-objects\.cc@-imsvcC:\\Program Files\\LLVM\\lib\\clang\\16.0.6\\include' --host_per_file_copt='external/v8/src/objects/literal-objects.cc@-imsvcC:\\Program Files\\LLVM\\lib\\clang\\16.0.6\\include'
-build:windows --per_file_copt='external/v8/src/runtime/runtime-object\.cc@-imsvcC:\\Program Files\\LLVM\\lib\\clang\\16.0.6\\include' --host_per_file_copt='external/v8/src/runtime/runtime-object.cc@-imsvcC:\\Program Files\\LLVM\\lib\\clang\\16.0.6\\include'
-build:windows --per_file_copt='external/v8/src/objects/swiss-name-dictionary\.cc@-imsvcC:\\Program Files\\LLVM\\lib\\clang\\16.0.6\\include' --host_per_file_copt='external/v8/src/objects/swiss-name-dictionary.cc@-imsvcC:\\Program Files\\LLVM\\lib\\clang\\16.0.6\\include'
-
 # enable clang coverage: https://clang.llvm.org/docs/SourceBasedCodeCoverage.html
 build:clang-coverage --copt="-fprofile-instr-generate" --linkopt="-fprofile-instr-generate"
 build:clang-coverage --copt="-fcoverage-mapping" --linkopt="-fcoverage-mapping"
diff --git a/.bazelversion b/.bazelversion
index 798e38995c4..3d9f29ee138 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.3.0
+6.4.0rc1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b92be047edf..c30271cbb05 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -63,8 +63,6 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           [System.IO.File]::WriteAllLines((Join-Path -Path $env:USERPROFILE -ChildPath '.bazelrc'), 'startup --output_user_root=C:/tmp')
-          # Work around bazel clang 16 include path bug (https://github.com/bazelbuild/bazel/issues/17863)
-          Move-Item -Path "C:\Program Files\LLVM\lib\clang\16" -Destination "C:\Program Files\LLVM\lib\clang\16.0.6"
       - name: Bazel build
         run: |
           bazelisk build --disk_cache=~/bazel-disk-cache  --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev -c opt //src/workerd/server:workerd
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0ea032ba95f..28b36f776bc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -69,8 +69,6 @@ jobs:
         run: |
             [System.IO.File]::WriteAllLines((Join-Path -Path $env:USERPROFILE -ChildPath '.bazelrc'), 'startup --output_user_root=C:/tmp')
             [System.IO.File]::WriteAllLines((Join-Path -Path $env:USERPROFILE -ChildPath '.bazelrc'), 'build:windows --config=windows_no_dbg')
-            # Work around bazel clang 16 include path bug (https://github.com/bazelbuild/bazel/issues/17863)
-            Move-Item -Path "C:\Program Files\LLVM\lib\clang\16" -Destination "C:\Program Files\LLVM\lib\clang\16.0.6"
       - name: Bazel build
         # timestamps are no longer being added here, the GitHub logs include timestamps (Use
         # 'Show timestamps' on the web interface)
diff --git a/WORKSPACE b/WORKSPACE
index db0d46bd1f9..87b10138d20 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -223,7 +223,7 @@ rules_rust_dependencies()
 
 rust_register_toolchains(
     edition = "2018",
-    versions = ["1.66.0"],
+    versions = ["1.72.1"],
 )
 
 load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies")