Skip to content

Commit 51c7d2a

Browse files
committed
Simplify toolchain setup
1 parent c533143 commit 51c7d2a

3 files changed

Lines changed: 2 additions & 14 deletions

File tree

.bazelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ build:macos \
1212
--macos_minimum_os=13.5 --host_macos_minimum_os=13.5
1313

1414
build:windows \
15-
--extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl \
16-
--extra_execution_platforms=//:x64_windows-clang-cl
15+
--compiler=clang-cl \
16+
--action_env=BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
1717

1818
build \
1919
--disk_cache=~/.bazel_cache \

.github/workflows/test.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ jobs:
7474
arch: arm64
7575
windows-display-name: '11 ARM'
7676
swift-version: 6.2.1
77-
env:
78-
CC: clang
79-
BAZEL_LLVM: C:\Program Files\LLVM
8077
steps:
8178
- uses: compnerd/gha-setup-swift@main
8279
with:

BUILD

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,6 @@ config_setting(
2323
},
2424
)
2525

26-
platform(
27-
name = "x64_windows-clang-cl",
28-
constraint_values = [
29-
"@platforms//cpu:x86_64",
30-
"@platforms//os:windows",
31-
"@bazel_tools//tools/cpp:clang-cl",
32-
],
33-
)
34-
3526
# Targets
3627

3728
swift_library(

0 commit comments

Comments
 (0)