Skip to content

Commit b025ac0

Browse files
committed
Fix redundant clang-cl and msvc platform constraint for Bazel 8 compatibility and enable Bazel 8 presubmits in BCR.
PiperOrigin-RevId: 727052001
1 parent 8171744 commit b025ac0

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.bcr/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ bcr_test_module:
22
module_path: examples
33
matrix:
44
platform: ["debian10", "macos", "ubuntu2004", "windows"]
5-
bazel: [7.x]
5+
bazel: [7.x, 8.x]
66

77
tasks:
88
verify_targets:

WORKSPACE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,12 @@ load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependen
9797

9898
apple_support_dependencies()
9999

100-
load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies")
100+
load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
101101

102102
rules_cc_dependencies()
103103

104+
rules_cc_toolchains()
105+
104106
# For `kt_jvm_library`
105107
load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
106108

build_defs/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ platform(
2828
constraint_values = [
2929
"@platforms//cpu:x86_64",
3030
"@platforms//os:windows",
31-
"@bazel_tools//tools/cpp:clang-cl",
3231
# This is necessary for Bazel 7 compatibility with a MODULE.bazel file that still works in
3332
# Bazel 8. Using cc_configure_extension from rules_cc produces a @local_config_cc
3433
# repository that's not compatible with @bazel_tools//tools/cpp:clang-cl from before
@@ -42,7 +41,6 @@ platform(
4241
constraint_values = [
4342
"@platforms//cpu:x86_64",
4443
"@platforms//os:windows",
45-
"@bazel_tools//tools/cpp:msvc",
4644
# This may be necessary in case cc_configure_extension from rules_cc produces a
4745
# @local_config_cc repository that's not compatible with @bazel_tools//tools/cpp:msvc from
4846
# before Bazel 8, as with clang-cl above, to avoid silently falling back to clang-cl.

0 commit comments

Comments
 (0)