diff --git a/.bazelrc b/.bazelrc index 5fbbc6bbc2..00ce0e3bcb 100644 --- a/.bazelrc +++ b/.bazelrc @@ -52,3 +52,5 @@ build:docker-sandbox --experimental_docker_image=gcr.io/cloud-marketplace/google # Incompatible flags to run with build --incompatible_no_implicit_file_export build --incompatible_restrict_string_escapes +# TODO(alexeagle): turn on this flag when dependencies allow +# build --incompatible_use_platforms_repo_for_constraints diff --git a/packages/concatjs/devserver/BUILD.bazel b/packages/concatjs/devserver/BUILD.bazel index 9e3fc71d68..cd506081f7 100644 --- a/packages/concatjs/devserver/BUILD.bazel +++ b/packages/concatjs/devserver/BUILD.bazel @@ -74,40 +74,40 @@ filegroup( config_setting( name = "darwin_x64", constraint_values = [ - "@bazel_tools//platforms:osx", - "@bazel_tools//platforms:x86_64", + "@platforms//os:osx", + "@platforms//cpu:x86_64", ], ) config_setting( name = "linux_x64", constraint_values = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:x86_64", + "@platforms//os:linux", + "@platforms//cpu:x86_64", ], ) config_setting( name = "linux_arm64", constraint_values = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:aarch64", + "@platforms//os:linux", + "@platforms//cpu:aarch64", ], ) config_setting( name = "linux_s390x", constraint_values = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:s390x", + "@platforms//os:linux", + "@platforms//cpu:s390x", ], ) config_setting( name = "windows_x64", constraint_values = [ - "@bazel_tools//platforms:windows", - "@bazel_tools//platforms:x86_64", + "@platforms//os:windows", + "@platforms//cpu:x86_64", ], ) diff --git a/toolchains/node/BUILD.bazel b/toolchains/node/BUILD.bazel index a2c6c98e28..342e530342 100644 --- a/toolchains/node/BUILD.bazel +++ b/toolchains/node/BUILD.bazel @@ -20,40 +20,40 @@ licenses(["notice"]) # Apache 2.0 platform( name = "darwin_amd64", constraint_values = [ - "@bazel_tools//platforms:osx", - "@bazel_tools//platforms:x86_64", + "@platforms//os:osx", + "@platforms//cpu:x86_64", ], ) platform( name = "linux_amd64", constraint_values = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:x86_64", + "@platforms//os:linux", + "@platforms//cpu:x86_64", ], ) platform( name = "linux_arm64", constraint_values = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:aarch64", + "@platforms//os:linux", + "@platforms//cpu:aarch64", ], ) platform( name = "windows_amd64", constraint_values = [ - "@bazel_tools//platforms:windows", - "@bazel_tools//platforms:x86_64", + "@platforms//os:windows", + "@platforms//cpu:x86_64", ], ) platform( name = "linux_s390x", constraint_values = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:s390x", + "@platforms//os:linux", + "@platforms//cpu:s390x", ], ) @@ -104,8 +104,8 @@ alias( toolchain( name = "node_linux_amd64_toolchain", target_compatible_with = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:x86_64", + "@platforms//os:linux", + "@platforms//cpu:x86_64", ], toolchain = "@nodejs_linux_amd64_config//:toolchain", toolchain_type = ":toolchain_type", @@ -114,8 +114,8 @@ toolchain( toolchain( name = "node_linux_arm64_toolchain", target_compatible_with = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:aarch64", + "@platforms//os:linux", + "@platforms//cpu:aarch64", ], toolchain = "@nodejs_linux_arm64_config//:toolchain", toolchain_type = ":toolchain_type", @@ -124,8 +124,8 @@ toolchain( toolchain( name = "node_darwin_amd64_toolchain", target_compatible_with = [ - "@bazel_tools//platforms:osx", - "@bazel_tools//platforms:x86_64", + "@platforms//os:osx", + "@platforms//cpu:x86_64", ], toolchain = "@nodejs_darwin_amd64_config//:toolchain", toolchain_type = ":toolchain_type", @@ -134,8 +134,8 @@ toolchain( toolchain( name = "node_windows_amd64_toolchain", target_compatible_with = [ - "@bazel_tools//platforms:windows", - "@bazel_tools//platforms:x86_64", + "@platforms//os:windows", + "@platforms//cpu:x86_64", ], toolchain = "@nodejs_windows_amd64_config//:toolchain", toolchain_type = ":toolchain_type", @@ -144,8 +144,8 @@ toolchain( toolchain( name = "node_linux_s390x_toolchain", target_compatible_with = [ - "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:s390x", + "@platforms//os:linux", + "@platforms//cpu:s390x", ], toolchain = "@nodejs_linux_s390x_config//:toolchain", toolchain_type = ":toolchain_type",