Skip to content

Commit f0095ea

Browse files
committed
back to clang-cl, added vs2026 (14.50) for testing
1 parent fd60e07 commit f0095ea

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.bazelrc

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,25 @@ test --test_tag_filters=-jaeger,-opentracing,-opentracing_shim,-etw,-es,-prometh
4242

4343
build --experimental_convenience_symlinks=clean
4444

45-
build:windows --copt="/Brepro" --copt="/guard:cf" --copt="/guard:ehcont" --copt="/Z7" --copt="/JMC-" --copt="/sdl"
46-
build:windows --host_copt="/Brepro" --copt="/guard:cf" --copt="/guard:ehcont" --copt="/Z7" --copt="/JMC-" --copt="/sdl"
47-
build:windows --linkopt="/Brepro" --linkopt="/guard:cf" --linkopt="/guard:ehcont" --linkopt="/DEBUG:FULL" --linkopt="/CETCOMPAT" --linkopt="/SWAPRUN:NET,CD" --linkopt="/OPT:REF,NOICF" --linkopt="/RELEASE" --linkopt="/DEBUGTYPE:CV,PDATA,FIXUP"
48-
build:windows --host_linkopt="/Brepro" --linkopt="/guard:cf" --linkopt="/guard:ehcont" --linkopt="/DEBUG:FULL" --linkopt="/CETCOMPAT" --linkopt="/SWAPRUN:NET,CD" --linkopt="/OPT:REF,NOICF" --linkopt="/RELEASE" --linkopt="/DEBUGTYPE:CV,PDATA,FIXUP"
45+
build:windows --copt="/Brepro" --copt="/guard:cf" --copt="/guard:ehcont" --copt="/Z7" --copt="/JMC-" --copt="/sdl"
46+
build:windows --host_copt="/Brepro" --host_copt="/guard:cf" --host_copt="/guard:ehcont" --host_copt="/Z7" --host_copt="/JMC-" --host_copt="/sdl"
47+
build:windows --linkopt="/Brepro" --linkopt="/guard:cf" --linkopt="/guard:ehcont" --linkopt="/DEBUG:FULL" --linkopt="/CETCOMPAT" --linkopt="/SWAPRUN:NET,CD" --linkopt="/OPT:REF,NOICF" --linkopt="/RELEASE" --linkopt="/DEBUGTYPE:CV,PDATA,FIXUP"
48+
build:windows --host_linkopt="/Brepro" --host_linkopt="/guard:cf" --host_linkopt="/guard:ehcont" --host_linkopt="/DEBUG:FULL" --host_linkopt="/CETCOMPAT" --host_linkopt="/SWAPRUN:NET,CD" --host_linkopt="/OPT:REF,NOICF" --host_linkopt="/RELEASE" --host_linkopt="/DEBUGTYPE:CV,PDATA,FIXUP"
4949
build:windows --copt="/Zc:strictStrings" --copt="/Gy" --copt="-DGPR_DISABLE_ABSEIL_SYNC"
5050
build:windows --host_copt="/Zc:strictStrings" --host_copt="/Gy" --host_copt="-DGPR_DISABLE_ABSEIL_SYNC"
51+
build:windows --linkopt="shell32.lib"
5152
build:windows --host_linkopt="shell32.lib"
53+
5254
# Requires Visual Studio 2019 Build Tools installed in default location with the latest compiler (14.29.30133) for x64
55+
5356
build:windows --action_env=BAZEL_VC_FULL_VERSION=14.29.30133 --action_env=BAZEL_WINSDK_FULL_VERSION=10.0.26100.0
5457
build:windows --host_action_env=BAZEL_VC_FULL_VERSION=14.29.30133 --host_action_env=BAZEL_WINSDK_FULL_VERSION=10.0.26100.0
58+
59+
# build:windows --action_env=BAZEL_VC_FULL_VERSION=14.50.35503 --action_env=BAZEL_WINSDK_FULL_VERSION=10.0.26100.0
60+
# build:windows --host_action_env=BAZEL_VC_FULL_VERSION=14.50.35503 --host_action_env=BAZEL_WINSDK_FULL_VERSION=10.0.26100.0
61+
# build:windows --action_env=BAZEL_VC="C:\\Program Files\\Microsoft Visual Studio\\18\\Insiders\\VC"
62+
# build:windows --host_action_env=BAZEL_VC="C:\\Program Files\\Microsoft Visual Studio\\18\\Insiders\\VC"
63+
5564
build:windows --features=shorten_virtual_includes
5665

5766
# grpc+\src/core/util/useful.h(193): error C4146: unary minus operator applied to unsigned type, result still unsigned
@@ -221,7 +230,7 @@ common --skip_incompatible_explicit_targets
221230
mod --lockfile_mode=refresh
222231

223232
# Select clang-cl to be the default compiler on Windows
224-
#build:windows --config=clang-cl
233+
build:windows --config=clang-cl
225234

226235
# See MODULE.bazel where we've disabled the platform/toolchain setup, but made it back here
227236
build:clang-cl --host_copt=-Wno-dynamic-class-memaccess --copt=-Wno-dynamic-class-memaccess

.github/workflows/otel_sdk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
- name: Install LLVM with winget (ignore if already installed)
102102
shell: pwsh
103103
run: |
104-
winget install -e LLVM.LLVM -v 20.1.8 --accept-package-agreements --disable-interactivity --silent
104+
winget install -e LLVM.LLVM -v 21.1.1 --accept-package-agreements --disable-interactivity --silent
105105
if ($LASTEXITCODE -ne 0) {
106106
Write-Host "Winget install failed or not needed (already installed)"
107107
exit 0

0 commit comments

Comments
 (0)