Skip to content

Commit b341421

Browse files
authored
fix: canonicalize @platforms//cpu:aarch64 (#3555)
This is defined as an alias to :arm64: https://github.com/bazelbuild/platforms/blob/212a486d66569b29c95b00364e2584e80fd08614/cpu/BUILD#L16-L20 but toolchain resolution doesn't understand the two to be equivalent. Fixes aspect-build/rules_js#469
1 parent ad70bee commit b341421

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

nodejs/private/toolchains_repo.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ PLATFORMS = {
2727
"linux_arm64": struct(
2828
compatible_with = [
2929
"@platforms//os:linux",
30-
"@platforms//cpu:aarch64",
30+
"@platforms//cpu:arm64",
3131
],
3232
),
3333
"linux_s390x": struct(
@@ -51,7 +51,7 @@ PLATFORMS = {
5151
"darwin_arm64": struct(
5252
compatible_with = [
5353
"@platforms//os:macos",
54-
"@platforms//cpu:aarch64",
54+
"@platforms//cpu:arm64",
5555
],
5656
),
5757
"windows_amd64": struct(

packages/concatjs/devserver/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ config_setting(
103103
name = "linux_arm64",
104104
constraint_values = [
105105
"@platforms//os:linux",
106-
"@platforms//cpu:aarch64",
106+
"@platforms//cpu:arm64",
107107
],
108108
)
109109

toolchains/esbuild/esbuild_packages.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ESBUILD_PACKAGES = struct(
3030
binary_path = "bin/esbuild",
3131
exec_compatible_with = [
3232
"@platforms//os:macos",
33-
"@platforms//cpu:aarch64",
33+
"@platforms//cpu:arm64",
3434
],
3535
),
3636
"linux_amd64": struct(
@@ -52,7 +52,7 @@ ESBUILD_PACKAGES = struct(
5252
binary_path = "bin/esbuild",
5353
exec_compatible_with = [
5454
"@platforms//os:linux",
55-
"@platforms//cpu:aarch64",
55+
"@platforms//cpu:arm64",
5656
],
5757
),
5858
"windows_amd64": struct(

0 commit comments

Comments
 (0)