Skip to content

Commit 8463e65

Browse files
authored
deps: Bump rules_rust -> 0.8.1 (#22253)
Fix #22073 Signed-off-by: Ryan Northey <[email protected]>
1 parent b15c85f commit 8463e65

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

bazel/repository_locations.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,12 +1343,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
13431343
project_name = "Bazel rust rules",
13441344
project_desc = "Bazel rust rules (used by Wasm)",
13451345
project_url = "https://github.com/bazelbuild/rules_rust",
1346-
version = "0.3.1",
1347-
sha256 = "e074f1e203607c5fcd549929d956170346f8807d2bbaeb98b2ed213c37e0870f",
1346+
version = "0.8.1",
1347+
sha256 = "05e15e536cc1e5fd7b395d044fc2dabf73d2b27622fbc10504b7e48219bb09bc",
13481348
urls = ["https://github.com/bazelbuild/rules_rust/releases/download/{version}/rules_rust-v{version}.tar.gz"],
13491349
use_category = ["dataplane_ext"],
13501350
extensions = ["envoy.wasm.runtime.wasmtime"],
1351-
release_date = "2022-04-26",
1351+
release_date = "2022-07-26",
13521352
cpe = "N/A",
13531353
license = "Apache-2.0",
13541354
license_url = "https://github.com/bazelbuild/rules_rust/blob/{version}/LICENSE.txt",

bazel/rules_rust.patch

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@@ -269,6 +269,13 @@ def triple_to_constraint_set(target_triple):
66
"@rules_rust//rust/platform/os:unknown",
77
]
8-
8+
99
+ # Workaround for https://github.com/bazelbuild/bazel/issues/14982
1010
+ if target_triple in ("armv7-linux-androideabi", "thumbv7neon-linux-androideabi"):
1111
+ return [
@@ -14,5 +14,18 @@
1414
+ ]
1515
+
1616
triple_struct = triple(target_triple)
17-
17+
1818
constraint_set = []
19+
20+
21+
--- rust/private/rustc.bzl
22+
+++ rust/private/rustc.bzl
23+
@@ -1024,7 +1024,7 @@ def rustc_compile_action(
24+
),
25+
]
26+
27+
- if crate_info.type in ["staticlib", "cdylib"]:
28+
+ if crate_info.type in ["staticlib", "cdylib"] and not out_binary:
29+
# These rules are not supposed to be depended on by other rust targets, and
30+
# as such they shouldn't provide a CrateInfo. However, one may still want to
31+
# write a rust_test for them, so we provide the CrateInfo wrapped in a provider

0 commit comments

Comments
 (0)