Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Linux ARM64 #26

Merged
merged 1 commit into from Sep 26, 2022
Merged

Support Linux ARM64 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions WORKSPACE
View file
Open in desktop
Expand Up @@ -97,6 +97,15 @@ http_file(
],
)

http_file(
name = "cargo_bazel_linux_arm64",
executable = True,
sha256 = "f2d168c386d38c0d5ca429c34dcbc5a6aec5be19ee1d4f6f0e614293b0e55468",
urls = [
"https://github.com/bazelbuild/rules_rust/releases/download/0.10.0/cargo-bazel-aarch64-unknown-linux-gnu",
],
)

http_file(
name = "cargo_bazel_macos_x64",
executable = True,
Expand Down
10 changes: 10 additions & 0 deletions rust-deps/BUILD.bazel
View file
Open in desktop
Expand Up @@ -10,6 +10,13 @@ selects.config_setting_group(
"@platforms//cpu:x86_64",
],
)
selects.config_setting_group(
name = "linux_arm64",
match_all = [
"@platforms//os:linux",
"@platforms//cpu:aarch64",
],
)
selects.config_setting_group(
name = "macos_x64",
match_all = [
Expand All @@ -26,6 +33,7 @@ selects.config_setting_group(
)
CARGO_BAZEL = select({
":linux_x64": "@cargo_bazel_linux_x64//file:downloaded",
":linux_arm64": "@cargo_bazel_linux_arm64//file:downloaded",
":macos_x64": "@cargo_bazel_macos_x64//file:downloaded",
":macos_arm64": "@cargo_bazel_macos_arm64//file:downloaded",
})
Expand Down Expand Up @@ -99,6 +107,7 @@ crates_vendor(
supported_platform_triples = [
"aarch64-apple-darwin",
"x86_64-apple-darwin",
"aarch64-unknown-linux-gnu",
"x86_64-unknown-linux-gnu",

# this is not used but its required to work around a bug in rules_rust where
Expand All @@ -121,6 +130,7 @@ crates_vendor(
supported_platform_triples = [
"aarch64-apple-darwin",
"x86_64-apple-darwin",
"aarch64-unknown-linux-gnu",
"x86_64-unknown-linux-gnu",
],
vendor_path = "cxxbridge_crates",
Expand Down
4 changes: 3 additions & 1 deletion rust-deps/crates/BUILD.ahash-0.7.6.bazel
View file
Open in desktop
Expand Up @@ -91,6 +91,7 @@ rust_library(
# cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", 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",
): [
Expand All @@ -103,12 +104,13 @@ rust_library(
# 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:wasm32-unknown-unknown",
"@rules_rust//rust/platform:x86_64-apple-darwin",
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
): [
# Target Deps
"@crates_vendor__once_cell-1.14.0//:once_cell",
"@crates_vendor__once_cell-1.15.0//:once_cell",

# Common Deps
"@crates_vendor__ahash-0.7.6//:build_script_build",
Expand Down
6 changes: 3 additions & 3 deletions rust-deps/crates/BUILD.anyhow-1.0.64.bazel → rust-deps/crates/BUILD.anyhow-1.0.65.bazel
View file
Open in desktop
Expand Up @@ -87,11 +87,11 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "1.0.64",
version = "1.0.65",
deps = [
] + select_with_or({
"//conditions:default": [
"@crates_vendor__anyhow-1.0.64//:build_script_build",
"@crates_vendor__anyhow-1.0.65//:build_script_build",
],
}),
)
Expand Down Expand Up @@ -155,7 +155,7 @@ cargo_build_script(
"//conditions:default": [
],
}),
version = "1.0.64",
version = "1.0.65",
visibility = ["//visibility:private"],
deps = [
] + select_with_or({
Expand Down
2 changes: 1 addition & 1 deletion rust-deps/crates/BUILD.backtrace-0.3.66.bazel
View file
Open in desktop
Expand Up @@ -94,7 +94,7 @@ rust_library(
"@crates_vendor__addr2line-0.17.0//:addr2line",
"@crates_vendor__backtrace-0.3.66//:build_script_build",
"@crates_vendor__cfg-if-1.0.0//:cfg_if",
"@crates_vendor__libc-0.2.132//:libc",
"@crates_vendor__libc-0.2.133//:libc",
"@crates_vendor__miniz_oxide-0.5.4//:miniz_oxide",
"@crates_vendor__object-0.29.0//:object",
"@crates_vendor__rustc-demangle-0.1.21//:rustc_demangle",
Expand Down
6 changes: 3 additions & 3 deletions rust-deps/crates/BUILD.bazel
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ alias(

alias(
name = "anyhow",
actual = "@crates_vendor__anyhow-1.0.64//:anyhow",
actual = "@crates_vendor__anyhow-1.0.65//:anyhow",
tags = ["manual"],
)

Expand All @@ -47,13 +47,13 @@ alias(

alias(
name = "cxx",
actual = "@crates_vendor__cxx-1.0.75//:cxx",
actual = "@crates_vendor__cxx-1.0.76//:cxx",
tags = ["manual"],
)

alias(
name = "libc",
actual = "@crates_vendor__libc-0.2.132//:libc",
actual = "@crates_vendor__libc-0.2.133//:libc",
tags = ["manual"],
)

Expand Down
4 changes: 2 additions & 2 deletions rust-deps/crates/BUILD.cssparser-0.27.2.bazel
View file
Open in desktop
Expand Up @@ -162,9 +162,9 @@ cargo_build_script(
deps = [
] + select_with_or({
"//conditions:default": [
"@crates_vendor__proc-macro2-1.0.43//:proc_macro2",
"@crates_vendor__proc-macro2-1.0.44//:proc_macro2",
"@crates_vendor__quote-1.0.21//:quote",
"@crates_vendor__syn-1.0.99//:syn",
"@crates_vendor__syn-1.0.101//:syn",
],
}),
)
Expand Down
2 changes: 1 addition & 1 deletion rust-deps/crates/BUILD.cssparser-macros-0.6.0.bazel
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@ rust_proc_macro(
] + select_with_or({
"//conditions:default": [
"@crates_vendor__quote-1.0.21//:quote",
"@crates_vendor__syn-1.0.99//:syn",
"@crates_vendor__syn-1.0.101//:syn",
],
}),
)
10 changes: 5 additions & 5 deletions rust-deps/crates/BUILD.cxx-1.0.75.bazel → rust-deps/crates/BUILD.cxx-1.0.76.bazel
View file
Open in desktop
Expand Up @@ -67,7 +67,7 @@ rust_library(
proc_macro_deps = [
] + select_with_or({
"//conditions:default": [
"@crates_vendor__cxxbridge-macro-1.0.75//:cxxbridge_macro",
"@crates_vendor__cxxbridge-macro-1.0.76//:cxxbridge_macro",
],
}),
rustc_env = {
Expand All @@ -89,11 +89,11 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "1.0.75",
version = "1.0.76",
deps = [
] + select_with_or({
"//conditions:default": [
"@crates_vendor__cxx-1.0.75//:build_script_build",
"@crates_vendor__cxx-1.0.76//:build_script_build",
"@crates_vendor__link-cplusplus-1.0.7//:link_cplusplus",
],
}),
Expand Down Expand Up @@ -160,13 +160,13 @@ cargo_build_script(
"//conditions:default": [
],
}),
version = "1.0.75",
version = "1.0.76",
visibility = ["//visibility:private"],
deps = [
] + select_with_or({
"//conditions:default": [
"@crates_vendor__cc-1.0.73//:cc",
"@crates_vendor__cxxbridge-flags-1.0.75//:cxxbridge_flags",
"@crates_vendor__cxxbridge-flags-1.0.76//:cxxbridge_flags",
],
}),
)
Expand Down
2 changes: 1 addition & 1 deletion ...crates/BUILD.cxxbridge-flags-1.0.75.bazel → ...crates/BUILD.cxxbridge-flags-1.0.76.bazel
View file
Open in desktop
Expand Up @@ -82,7 +82,7 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "1.0.75",
version = "1.0.76",
deps = [
] + select_with_or({
"//conditions:default": [
Expand Down
6 changes: 3 additions & 3 deletions ...crates/BUILD.cxxbridge-macro-1.0.75.bazel → ...crates/BUILD.cxxbridge-macro-1.0.76.bazel
View file
Open in desktop
Expand Up @@ -81,13 +81,13 @@ rust_proc_macro(
"noclippy",
"norustfmt",
],
version = "1.0.75",
version = "1.0.76",
deps = [
] + select_with_or({
"//conditions:default": [
"@crates_vendor__proc-macro2-1.0.43//:proc_macro2",
"@crates_vendor__proc-macro2-1.0.44//:proc_macro2",
"@crates_vendor__quote-1.0.21//:quote",
"@crates_vendor__syn-1.0.99//:syn",
"@crates_vendor__syn-1.0.101//:syn",
],
}),
)
4 changes: 2 additions & 2 deletions rust-deps/crates/BUILD.derive_more-0.99.17.bazel
View file
Open in desktop
Expand Up @@ -112,9 +112,9 @@ rust_proc_macro(
] + select_with_or({
"//conditions:default": [
"@crates_vendor__convert_case-0.4.0//:convert_case",
"@crates_vendor__proc-macro2-1.0.43//:proc_macro2",
"@crates_vendor__proc-macro2-1.0.44//:proc_macro2",
"@crates_vendor__quote-1.0.21//:quote",
"@crates_vendor__syn-1.0.99//:syn",
"@crates_vendor__syn-1.0.101//:syn",
],
}),
)
3 changes: 2 additions & 1 deletion rust-deps/crates/BUILD.getrandom-0.1.16.bazel
View file
Open in desktop
Expand Up @@ -97,11 +97,12 @@ rust_library(
# 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",
): [
# Target Deps
"@crates_vendor__libc-0.2.132//:libc",
"@crates_vendor__libc-0.2.133//:libc",

# Common Deps
"@crates_vendor__cfg-if-1.0.0//:cfg_if",
Expand Down
3 changes: 2 additions & 1 deletion rust-deps/crates/BUILD.getrandom-0.2.7.bazel
View file
Open in desktop
Expand Up @@ -92,11 +92,12 @@ rust_library(
# 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",
): [
# Target Deps
"@crates_vendor__libc-0.2.132//:libc",
"@crates_vendor__libc-0.2.133//:libc",

# Common Deps
"@crates_vendor__cfg-if-1.0.0//:cfg_if",
Expand Down
6 changes: 3 additions & 3 deletions rust-deps/crates/BUILD.libc-0.2.132.bazel → rust-deps/crates/BUILD.libc-0.2.133.bazel
View file
Open in desktop
Expand Up @@ -87,11 +87,11 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "0.2.132",
version = "0.2.133",
deps = [
] + select_with_or({
"//conditions:default": [
"@crates_vendor__libc-0.2.132//:build_script_build",
"@crates_vendor__libc-0.2.133//:build_script_build",
],
}),
)
Expand Down Expand Up @@ -155,7 +155,7 @@ cargo_build_script(
"//conditions:default": [
],
}),
version = "0.2.132",
version = "0.2.133",
visibility = ["//visibility:private"],
deps = [
] + select_with_or({
Expand Down
2 changes: 1 addition & 1 deletion rust-deps/crates/BUILD.lol_html-0.3.1.bazel
View file
Open in desktop
Expand Up @@ -95,7 +95,7 @@ rust_library(
"@crates_vendor__memchr-2.5.0//:memchr",
"@crates_vendor__safemem-0.3.3//:safemem",
"@crates_vendor__selectors-0.22.0//:selectors",
"@crates_vendor__thiserror-1.0.34//:thiserror",
"@crates_vendor__thiserror-1.0.36//:thiserror",
],
}),
)
4 changes: 2 additions & 2 deletions rust-deps/crates/BUILD.lolhtml-0.2.0.bazel
View file
Open in desktop
Expand Up @@ -86,9 +86,9 @@ rust_library(
] + select_with_or({
"//conditions:default": [
"@crates_vendor__encoding_rs-0.8.31//:encoding_rs",
"@crates_vendor__libc-0.2.132//:libc",
"@crates_vendor__libc-0.2.133//:libc",
"@crates_vendor__lol_html-0.3.1//:lol_html",
"@crates_vendor__thiserror-1.0.34//:thiserror",
"@crates_vendor__thiserror-1.0.36//:thiserror",
],
}),
)
4 changes: 2 additions & 2 deletions ...-deps/crates/BUILD.once_cell-1.14.0.bazel → ...-deps/crates/BUILD.once_cell-1.15.0.bazel
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ rust_library(
"//conditions:default": [
],
}),
edition = "2018",
edition = "2021",
proc_macro_deps = [
] + select_with_or({
"//conditions:default": [
Expand All @@ -83,7 +83,7 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "1.14.0",
version = "1.15.0",
deps = [
] + select_with_or({
"//conditions:default": [
Expand Down
4 changes: 2 additions & 2 deletions rust-deps/crates/BUILD.phf_macros-0.8.0.bazel
View file
Open in desktop
Expand Up @@ -88,9 +88,9 @@ rust_proc_macro(
"//conditions:default": [
"@crates_vendor__phf_generator-0.8.0//:phf_generator",
"@crates_vendor__phf_shared-0.8.0//:phf_shared",
"@crates_vendor__proc-macro2-1.0.43//:proc_macro2",
"@crates_vendor__proc-macro2-1.0.44//:proc_macro2",
"@crates_vendor__quote-1.0.21//:quote",
"@crates_vendor__syn-1.0.99//:syn",
"@crates_vendor__syn-1.0.101//:syn",
],
}),
)
8 changes: 4 additions & 4 deletions ...eps/crates/BUILD.proc-macro2-1.0.43.bazel → ...eps/crates/BUILD.proc-macro2-1.0.44.bazel
View file
Open in desktop
Expand Up @@ -87,12 +87,12 @@ rust_library(
"noclippy",
"norustfmt",
],
version = "1.0.43",
version = "1.0.44",
deps = [
] + select_with_or({
"//conditions:default": [
"@crates_vendor__proc-macro2-1.0.43//:build_script_build",
"@crates_vendor__unicode-ident-1.0.3//:unicode_ident",
"@crates_vendor__proc-macro2-1.0.44//:build_script_build",
"@crates_vendor__unicode-ident-1.0.4//:unicode_ident",
],
}),
)
Expand Down Expand Up @@ -156,7 +156,7 @@ cargo_build_script(
"//conditions:default": [
],
}),
version = "1.0.43",
version = "1.0.44",
visibility = ["//visibility:private"],
deps = [
] + select_with_or({
Expand Down
2 changes: 1 addition & 1 deletion rust-deps/crates/BUILD.quote-1.0.21.bazel
View file
Open in desktop
Expand Up @@ -91,7 +91,7 @@ rust_library(
deps = [
] + select_with_or({
"//conditions:default": [
"@crates_vendor__proc-macro2-1.0.43//:proc_macro2",
"@crates_vendor__proc-macro2-1.0.44//:proc_macro2",
"@crates_vendor__quote-1.0.21//:build_script_build",
],
}),
Expand Down
4 changes: 3 additions & 1 deletion rust-deps/crates/BUILD.rand-0.7.3.bazel
View file
Open in desktop
Expand Up @@ -96,6 +96,7 @@ rust_library(
# cfg(not(target_os = "emscripten"))
(
"@rules_rust//rust/platform:aarch64-apple-darwin",
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
"@rules_rust//rust/platform:wasm32-unknown-unknown",
"@rules_rust//rust/platform:x86_64-apple-darwin",
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
Expand All @@ -116,11 +117,12 @@ rust_library(
# 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",
): [
# Target Deps
"@crates_vendor__libc-0.2.132//:libc",
"@crates_vendor__libc-0.2.133//:libc",

# Common Deps
"@crates_vendor__getrandom-0.1.16//:getrandom",
Expand Down
2 changes: 1 addition & 1 deletion rust-deps/crates/BUILD.rustc_version-0.4.0.bazel
View file
Open in desktop
Expand Up @@ -85,7 +85,7 @@ rust_library(
deps = [
] + select_with_or({
"//conditions:default": [
"@crates_vendor__semver-1.0.13//:semver",
"@crates_vendor__semver-1.0.14//:semver",
],
}),
)