From f950fa263b828e3da33039fe50e449d0a42f42e4 Mon Sep 17 00:00:00 2001 From: Ivo List Date: Thu, 10 Jul 2025 11:59:55 +0200 Subject: [PATCH] Use the linkstamps from linker_inputs instead of from cc_linking_context This change allows to remove linkstamp from CcLinkingContext. The change is a no-op. --- rust/private/rustc.bzl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rust/private/rustc.bzl b/rust/private/rustc.bzl index f84f8c09c8..ccddfc16e4 100644 --- a/rust/private/rustc.bzl +++ b/rust/private/rustc.bzl @@ -258,7 +258,8 @@ def collect_deps( dep_build_info = _get_build_info(dep) if cc_info: - linkstamps.append(cc_info.linking_context.linkstamps()) + for li in cc_info.linking_context.linker_inputs.to_list(): + linkstamps.extend(li.linkstamps) if crate_info: # This dependency is a rust_library @@ -359,7 +360,7 @@ def collect_deps( dep_env = build_info.dep_env if build_info else None, ), build_info, - depset(transitive = linkstamps), + depset(linkstamps), ) def _collect_libs_from_linker_inputs(linker_inputs, use_pic):