Skip to content

Commit 33b19be

Browse files
authored
Use the linkstamps from linker_inputs instead of from cc_linking_context
This change allows Bazel to remove linkstamp from CcLinkingContext. The change is a no-op.
1 parent 5c68ff9 commit 33b19be

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

python/private/py_executable.bzl

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,7 +1574,11 @@ def _create_shared_native_deps_dso(
15741574
feature_configuration,
15751575
requested_features,
15761576
cc_toolchain):
1577-
linkstamps = py_internal.linking_context_linkstamps(cc_info.linking_context)
1577+
linkstamps = [
1578+
py_internal.linkstamp_file(linkstamp)
1579+
for linker_input in cc_info.linking_context.linker_inputs.to_list()
1580+
for linkstamp in linker_input.linkstamps
1581+
]
15781582

15791583
partially_disabled_thin_lto = (
15801584
cc_common.is_enabled(
@@ -1598,10 +1602,7 @@ def _create_shared_native_deps_dso(
15981602
for input in cc_info.linking_context.linker_inputs.to_list()
15991603
for flag in input.user_link_flags
16001604
],
1601-
linkstamps = [
1602-
py_internal.linkstamp_file(linkstamp)
1603-
for linkstamp in linkstamps.to_list()
1604-
],
1605+
linkstamps = linkstamps,
16051606
build_info_artifacts = _get_build_info(ctx, cc_toolchain) if linkstamps else [],
16061607
features = requested_features,
16071608
is_test_target_partially_disabled_thin_lto = is_test and partially_disabled_thin_lto,

0 commit comments

Comments
 (0)