Skip to content

Commit 6a9a016

Browse files
authored
Use the linkstamps from linker_inputs instead of from cc_linking_context (#3500)
This change allows to remove linkstamp from CcLinkingContext. The change is a no-op.
1 parent 81b4220 commit 6a9a016

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

rust/private/rustc.bzl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,8 @@ def collect_deps(
258258
dep_build_info = _get_build_info(dep)
259259

260260
if cc_info:
261-
linkstamps.append(cc_info.linking_context.linkstamps())
261+
for li in cc_info.linking_context.linker_inputs.to_list():
262+
linkstamps.extend(li.linkstamps)
262263

263264
if crate_info:
264265
# This dependency is a rust_library
@@ -359,7 +360,7 @@ def collect_deps(
359360
dep_env = build_info.dep_env if build_info else None,
360361
),
361362
build_info,
362-
depset(transitive = linkstamps),
363+
depset(linkstamps),
363364
)
364365

365366
def _collect_libs_from_linker_inputs(linker_inputs, use_pic):

0 commit comments

Comments
 (0)