Revert "Simplify toolchain setup"

This reverts commit 51c7d2a.

Author: SimplyDanny

.bazelrc

@@ -12,8 +12,8 @@ build:macos \
   --macos_minimum_os=13.5 --host_macos_minimum_os=13.5
 
 build:windows \
-  --compiler=clang-cl \
-  --action_env=BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
+  --extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl \
+  --extra_execution_platforms=//:x64_windows-clang-cl
 
 build \
   --disk_cache=~/.bazel_cache \

.github/workflows/test.yml

@@ -74,6 +74,9 @@ jobs:
             arch: arm64
             windows-display-name: '11 ARM'
             swift-version: 6.2.1
+    env:
+      CC: clang
+      BAZEL_LLVM: C:\Program Files\LLVM
     steps:
       - uses: compnerd/gha-setup-swift@main
         with:

BUILD

@@ -23,6 +23,15 @@ config_setting(
     },
 )
 
+platform(
+    name = "x64_windows-clang-cl",
+    constraint_values = [
+        "@platforms//cpu:x86_64",
+        "@platforms//os:windows",
+        "@bazel_tools//tools/cpp:clang-cl",
+    ],
+)
+
 # Targets
 
 swift_library(