use constraints value in @platforms instead of @bazel_tools//platforms https://github.com/bazelbuild/bazel/issues/8622 (#29842)

pull/29436/head
Ara Nguyen 3 years ago committed by GitHub
parent 7c8d1b335c
commit f3fc1d4d75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      third_party/toolchains/BUILD
  2. 28
      third_party/toolchains/bazel_0.26.0_rbe_windows/BUILD
  3. 2
      third_party/upb/BUILD

@ -27,8 +27,8 @@ alias(
platform(
name = "rbe_windows_2019",
constraint_values = [
"@bazel_tools//platforms:x86_64",
"@bazel_tools//platforms:windows",
"@platforms//cpu:x86_64",
"@platforms//os:windows",
],
exec_properties = create_rbe_exec_properties_dict(
# See rbe_win2019/Dockerfile for image details

@ -65,13 +65,13 @@ cc_toolchain_config(
toolchain(
name = "cc-toolchain-x64_windows_msys",
exec_compatible_with = [
"@bazel_tools//platforms:x86_64",
"@bazel_tools//platforms:windows",
"@platforms//cpu:x86_64",
"@platforms//os:windows",
"@bazel_tools//tools/cpp:msys",
],
target_compatible_with = [
"@bazel_tools//platforms:x86_64",
"@bazel_tools//platforms:windows",
"@platforms//cpu:x86_64",
"@platforms//os:windows",
],
toolchain = ":cc-compiler-x64_windows_msys",
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
@ -101,13 +101,13 @@ cc_toolchain_config(
toolchain(
name = "cc-toolchain-x64_windows_mingw",
exec_compatible_with = [
"@bazel_tools//platforms:x86_64",
"@bazel_tools//platforms:windows",
"@platforms//cpu:x86_64",
"@platforms//os:windows",
"@bazel_tools//tools/cpp:mingw",
],
target_compatible_with = [
"@bazel_tools//platforms:x86_64",
"@bazel_tools//platforms:windows",
"@platforms//cpu:x86_64",
"@platforms//os:windows",
],
toolchain = ":cc-compiler-x64_windows_mingw",
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
@ -137,12 +137,12 @@ cc_toolchain_config(
toolchain(
name = "cc-toolchain-x64_windows",
exec_compatible_with = [
"@bazel_tools//platforms:x86_64",
"@bazel_tools//platforms:windows",
"@platforms//cpu:x86_64",
"@platforms//os:windows",
],
target_compatible_with = [
"@bazel_tools//platforms:x86_64",
"@bazel_tools//platforms:windows",
"@platforms//cpu:x86_64",
"@platforms//os:windows",
],
toolchain = ":cc-compiler-x64_windows",
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
@ -174,8 +174,8 @@ toolchain(
exec_compatible_with = [
],
target_compatible_with = [
"@bazel_tools//platforms:arm",
"@bazel_tools//platforms:android",
"@platforms//cpu:arm",
"@platforms//os:android",
],
toolchain = ":cc-compiler-armeabi-v7a",
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",

@ -58,7 +58,7 @@ exports_files(
config_setting(
name = "windows",
constraint_values = ["@bazel_tools//platforms:windows"],
constraint_values = ["@platforms//os:windows"],
visibility = ["//visibility:public"],
)

Loading…
Cancel
Save