Skip to content

Commit

Permalink
deps: Bump rules_rust -> 0.8.1 (envoyproxy#22253)
Browse files Browse the repository at this point in the history
Fix envoyproxy#22073

Signed-off-by: Ryan Northey <[email protected]>
  • Loading branch information
phlax committed Dec 4, 2022
1 parent 84ffdc5 commit 29e6277
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1339,12 +1339,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "Bazel rust rules",
project_desc = "Bazel rust rules (used by Wasm)",
project_url = "https://github.com/bazelbuild/rules_rust",
version = "0.3.1",
sha256 = "e074f1e203607c5fcd549929d956170346f8807d2bbaeb98b2ed213c37e0870f",
version = "0.8.1",
sha256 = "05e15e536cc1e5fd7b395d044fc2dabf73d2b27622fbc10504b7e48219bb09bc",
urls = ["https://github.com/bazelbuild/rules_rust/releases/download/{version}/rules_rust-v{version}.tar.gz"],
use_category = ["dataplane_ext"],
extensions = ["envoy.wasm.runtime.wasmtime"],
release_date = "2022-04-26",
release_date = "2022-07-26",
cpe = "N/A",
license = "Apache-2.0",
license_url = "https://github.com/bazelbuild/rules_rust/blob/{version}/LICENSE.txt",
Expand Down
17 changes: 15 additions & 2 deletions bazel/rules_rust.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@@ -269,6 +269,13 @@ def triple_to_constraint_set(target_triple):
"@rules_rust//rust/platform/os:unknown",
]

+ # Workaround for https://github.com/bazelbuild/bazel/issues/14982
+ if target_triple in ("armv7-linux-androideabi", "thumbv7neon-linux-androideabi"):
+ return [
Expand All @@ -14,5 +14,18 @@
+ ]
+
triple_struct = triple(target_triple)

constraint_set = []


--- rust/private/rustc.bzl
+++ rust/private/rustc.bzl
@@ -1024,7 +1024,7 @@ def rustc_compile_action(
),
]

- if crate_info.type in ["staticlib", "cdylib"]:
+ if crate_info.type in ["staticlib", "cdylib"] and not out_binary:
# These rules are not supposed to be depended on by other rust targets, and
# as such they shouldn't provide a CrateInfo. However, one may still want to
# write a rust_test for them, so we provide the CrateInfo wrapped in a provider

0 comments on commit 29e6277

Please sign in to comment.