Merge branch 'main' into target_compatible_with-attr

bazelbuild · Aug 25, 2023 · aab2ea4 · aab2ea4
2 parents f65d411 + 8861598
commit aab2ea4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/cargo/private/cargo_build_script.bzl b/cargo/private/cargo_build_script.bzl
@@ -188,6 +188,9 @@ def _cargo_build_script_impl(ctx):
             if type(all_files) == "list":
                 all_files = depset(all_files)
             toolchain_tools.append(all_files)
+        if platform_common.TemplateVariableInfo in target:
+            variables = getattr(target[platform_common.TemplateVariableInfo], "variables", depset([]))
+            env.update(variables)
 
     _merge_env_dict(env, expand_dict_value_locations(
         ctx,

diff --git a/docs/rust_proto.md b/docs/rust_proto.md
@@ -128,7 +128,7 @@ rust_library_group(
 )
 
 rust_prost_toolchain(
-    name = "prost_toolchain_impl",
+    name = "default_prost_toolchain_impl",
     prost_plugin = "@crates_io//:protoc-gen-prost__protoc-gen-prost",
     prost_runtime = ":prost_runtime",
     prost_types = "@crates_io//:prost-types",

diff --git a/docs/rust_proto.vm b/docs/rust_proto.vm
@@ -114,7 +114,7 @@ rust_library_group(
 )
 
 rust_prost_toolchain(
-    name = "prost_toolchain_impl",
+    name = "default_prost_toolchain_impl",
     prost_plugin = "@crates_io//:protoc-gen-prost__protoc-gen-prost",
     prost_runtime = ":prost_runtime",
     prost_types = "@crates_io//:prost-types",