Replace references to @bazel_tools//platforms with @platforms//.

The former has been deprecated and will break by --incompatible_use_platforms_repo_for_constraints, as announced in bazelbuild/bazel#8622. Fixes #354.
bazel-contrib · Sep 16, 2020 · 0adb81b · 0adb81b
1 parent ea571fc
commit 0adb81b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/examples/BUILD b/examples/BUILD
@@ -88,8 +88,8 @@ sh_test(
 toolchain(
     name = "built_ninja_toolchain_osx",
     exec_compatible_with = [
-        "@bazel_tools//platforms:osx",
-        "@bazel_tools//platforms:x86_64",
+        "@platforms//os:osx",
+        "@platforms//cpu:x86_64",
     ],
     toolchain = "@rules_foreign_cc//tools/build_defs/native_tools:built_ninja",
     toolchain_type = "@rules_foreign_cc//tools/build_defs:ninja_toolchain",
@@ -98,8 +98,8 @@ toolchain(
 toolchain(
     name = "built_ninja_toolchain_linux",
     exec_compatible_with = [
-        "@bazel_tools//platforms:linux",
-        "@bazel_tools//platforms:x86_64",
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
     ],
     toolchain = "@rules_foreign_cc//tools/build_defs/native_tools:built_ninja",
     toolchain_type = "@rules_foreign_cc//tools/build_defs:ninja_toolchain",

diff --git a/toolchains_examples/BUILD b/toolchains_examples/BUILD
@@ -20,8 +20,8 @@ constraint_value(
 platform(
     name = "fancy_platform",
     constraint_values = [
-        "@bazel_tools//platforms:linux",
-        "@bazel_tools//platforms:x86_64",
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
         ":fancy_constraint_value",
     ],
 )

diff --git a/tools/build_defs/shell_toolchain/toolchains/toolchain_mappings.bzl b/tools/build_defs/shell_toolchain/toolchains/toolchain_mappings.bzl
@@ -10,22 +10,22 @@ ToolchainMapping = provider(
 TOOLCHAIN_MAPPINGS = [
     ToolchainMapping(
         exec_compatible_with = [
-            "@bazel_tools//platforms:linux",
-            "@bazel_tools//platforms:x86_64",
+            "@platforms//os:linux",
+            "@platforms//cpu:x86_64",
         ],
         file = "@rules_foreign_cc//tools/build_defs/shell_toolchain/toolchains/impl:linux_commands.bzl",
     ),
     ToolchainMapping(
         exec_compatible_with = [
-            "@bazel_tools//platforms:windows",
-            "@bazel_tools//platforms:x86_64",
+            "@platforms//os:windows",
+            "@platforms//cpu:x86_64",
         ],
         file = "@rules_foreign_cc//tools/build_defs/shell_toolchain/toolchains/impl:windows_commands.bzl",
     ),
     ToolchainMapping(
         exec_compatible_with = [
-            "@bazel_tools//platforms:osx",
-            "@bazel_tools//platforms:x86_64",
+            "@platforms//os:osx",
+            "@platforms//cpu:x86_64",
         ],
         file = "@rules_foreign_cc//tools/build_defs/shell_toolchain/toolchains/impl:osx_commands.bzl",
     ),