Skip to content

Commit 8f60453

Browse files
committed
Run windows build with c++17 to avoid the protobuf compile issues. Also, bump the LLVM version a bit (it's relatively new already)
1 parent b32dc7c commit 8f60453

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.bazelrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ common:macos --features=-supports_dynamic_linker --linkopt=-framework --linkopt=
2424
# so we focus the effort for now is to have a Windows Verible compiled with
2525
# clang-cl before fixing the issues unique to MSVC.
2626
common:windows --extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl --extra_execution_platforms=//:x64_windows-clang-cl
27-
# Since we use designated initializers (C99 ... but >= c++20), compiler really wants the c++20 mode
28-
common:windows --compiler=clang-cl --cxxopt=/std:c++20 --host_cxxopt=/std:c++20 --client_env=BAZEL_CXXOPTS=/std:c++20
27+
common:windows --compiler=clang-cl --cxxopt=/std:c++17 --host_cxxopt=/std:c++17 --client_env=BAZEL_CXXOPTS=/std:c++17
2928

3029
build --cxxopt="-Wno-unknown-warning-option" --host_cxxopt="-Wno-unknown-warning-option"
3130
# TODO: this looks like benign where it happens but to be explored further.

.github/workflows/verible-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ jobs:
398398
run: |
399399
choco install bazel --force --version=7.6.1
400400
choco install winflexbison3
401-
choco install llvm --allow-downgrade --version=20.1.3
401+
choco install llvm --allow-downgrade --version=20.1.4
402402
403403
- name: Debug bazel directory settings
404404
# We need to explicitly call the bazel binary from choco, otherwise

0 commit comments

Comments
 (0)