Skip to content

Commit 6bd6bf6

Browse files
threepointonethreepointone
committed
Add aarch64-pc-windows-msvc to vendored Rust crate platform mappings
The vendored crate definitions in deps/rust/crates/defs.bzl were generated without the aarch64-pc-windows-msvc triple, causing Rust crates like windows_sys, mio, socket2, and termcolor to fail to resolve their Windows-specific dependencies on ARM64. Add the triple to the cfg(windows), cfg(any(target_arch = "aarch64")), cfg(not(all(target_arch = "arm"))) conditions and as a literal triple mapping. A proper crates_vendor --repin should be done once the googlesource auth issue is resolved for local development. Made-with: Cursor
1 parent 23bdba8 commit 6bd6bf6

9 files changed

Lines changed: 31 additions & 3 deletions

‎deps/rust/crates/BUILD.ahash-0.8.12.bazel‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ rust_library(
5656
"@rules_rust//rust/platform:x86_64-apple-darwin": [
5757
"@crates_vendor__once_cell-1.21.4//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
5858
],
59+
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
60+
"@crates_vendor__once_cell-1.21.4//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
61+
],
5962
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
6063
"@crates_vendor__once_cell-1.21.4//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
6164
],

‎deps/rust/crates/BUILD.jobserver-0.1.34.bazel‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ rust_library(
5151
"@rules_rust//rust/platform:x86_64-apple-darwin": [
5252
"@crates_vendor__libc-0.2.183//:libc", # cfg(unix)
5353
],
54+
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
55+
"@crates_vendor__getrandom-0.3.4//:getrandom", # cfg(windows)
56+
],
5457
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
5558
"@crates_vendor__getrandom-0.3.4//:getrandom", # cfg(windows)
5659
],

‎deps/rust/crates/BUILD.mio-1.2.0.bazel‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ rust_library(
5656
"@rules_rust//rust/platform:x86_64-apple-darwin": [
5757
"@crates_vendor__libc-0.2.183//:libc", # cfg(any(unix, target_os = "hermit", target_os = "wasi"))
5858
],
59+
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
60+
"@crates_vendor__windows-sys-0.61.2//:windows_sys", # cfg(windows)
61+
],
5962
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
6063
"@crates_vendor__windows-sys-0.61.2//:windows_sys", # cfg(windows)
6164
],

‎deps/rust/crates/BUILD.sha1-0.10.6.bazel‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ rust_library(
5858
"@rules_rust//rust/platform:x86_64-apple-darwin": [
5959
"@crates_vendor__cpufeatures-0.2.17//:cpufeatures", # cfg(any(target_arch = "aarch64", target_arch = "x86", target_arch = "x86_64"))
6060
],
61+
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
62+
"@crates_vendor__cpufeatures-0.2.17//:cpufeatures", # cfg(any(target_arch = "aarch64", target_arch = "x86", target_arch = "x86_64"))
63+
],
6164
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
6265
"@crates_vendor__cpufeatures-0.2.17//:cpufeatures", # cfg(any(target_arch = "aarch64", target_arch = "x86", target_arch = "x86_64"))
6366
],

‎deps/rust/crates/BUILD.socket2-0.6.3.bazel‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ rust_library(
5454
"@rules_rust//rust/platform:x86_64-apple-darwin": [
5555
"@crates_vendor__libc-0.2.183//:libc", # cfg(any(unix, target_os = "wasi"))
5656
],
57+
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
58+
"@crates_vendor__windows-sys-0.61.2//:windows_sys", # cfg(windows)
59+
],
5760
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
5861
"@crates_vendor__windows-sys-0.61.2//:windows_sys", # cfg(windows)
5962
],

‎deps/rust/crates/BUILD.termcolor-1.4.1.bazel‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ rust_library(
4242
],
4343
version = "1.4.1",
4444
deps = select({
45+
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
46+
"@crates_vendor__winapi-util-0.1.11//:winapi_util", # cfg(windows)
47+
],
4548
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
4649
"@crates_vendor__winapi-util-0.1.11//:winapi_util", # cfg(windows)
4750
],

‎deps/rust/crates/BUILD.tokio-1.50.0.bazel‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ rust_library(
3737
"socket2",
3838
"time",
3939
] + select({
40+
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
41+
"windows-sys", # aarch64-pc-windows-msvc
42+
],
4043
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
4144
"windows-sys", # x86_64-pc-windows-msvc
4245
],
@@ -69,6 +72,9 @@ rust_library(
6972
"@rules_rust//rust/platform:x86_64-apple-darwin": [
7073
"@crates_vendor__libc-0.2.183//:libc", # x86_64-apple-darwin
7174
],
75+
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
76+
"@crates_vendor__windows-sys-0.61.2//:windows_sys", # aarch64-pc-windows-msvc
77+
],
7278
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
7379
"@crates_vendor__windows-sys-0.61.2//:windows_sys", # x86_64-pc-windows-msvc
7480
],

‎deps/rust/crates/BUILD.winapi-util-0.1.11.bazel‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ rust_library(
4242
],
4343
version = "0.1.11",
4444
deps = select({
45+
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
46+
"@crates_vendor__windows-sys-0.61.2//:windows_sys", # cfg(windows)
47+
],
4548
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
4649
"@crates_vendor__windows-sys-0.61.2//:windows_sys", # cfg(windows)
4750
],

‎deps/rust/crates/defs.bzl‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -402,23 +402,24 @@ _CONDITIONS = {
402402
"cfg(all(target_arch = \"wasm32\", target_os = \"wasi\", target_env = \"p2\"))": [],
403403
"cfg(all(target_os = \"uefi\", getrandom_backend = \"efi_rng\"))": [],
404404
"cfg(any())": [],
405-
"cfg(any(target_arch = \"aarch64\", target_arch = \"x86\", target_arch = \"x86_64\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu"],
405+
"cfg(any(target_arch = \"aarch64\", target_arch = \"x86\", target_arch = \"x86_64\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu"],
406406
"cfg(any(target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"hurd\", target_os = \"illumos\", target_os = \"cygwin\", all(target_os = \"horizon\", target_arch = \"arm\")))": [],
407407
"cfg(any(target_os = \"haiku\", target_os = \"redox\", target_os = \"nto\", target_os = \"aix\"))": [],
408408
"cfg(any(target_os = \"ios\", target_os = \"visionos\", target_os = \"watchos\", target_os = \"tvos\"))": [],
409409
"cfg(any(target_os = \"macos\", target_os = \"openbsd\", target_os = \"vita\", target_os = \"emscripten\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-darwin"],
410410
"cfg(any(unix, target_os = \"hermit\", target_os = \"wasi\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu"],
411411
"cfg(any(unix, target_os = \"wasi\"))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu"],
412-
"cfg(not(all(target_arch = \"arm\", target_os = \"none\")))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu"],
412+
"cfg(not(all(target_arch = \"arm\", target_os = \"none\")))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu"],
413413
"cfg(not(windows))": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu"],
414414
"cfg(target_os = \"hermit\")": [],
415415
"cfg(target_os = \"netbsd\")": [],
416416
"cfg(target_os = \"solaris\")": [],
417417
"cfg(target_os = \"vxworks\")": [],
418418
"cfg(target_os = \"wasi\")": [],
419419
"cfg(unix)": ["@rules_rust//rust/platform:aarch64-apple-darwin", "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu"],
420-
"cfg(windows)": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
420+
"cfg(windows)": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc", "@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
421421
"x86_64-apple-darwin": ["@rules_rust//rust/platform:x86_64-apple-darwin"],
422+
"aarch64-pc-windows-msvc": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
422423
"x86_64-pc-windows-msvc": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
423424
"x86_64-unknown-linux-gnu": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu"],
424425
}

0 commit comments

Comments
 (0)