From dc7574c42855aba14c9b0e733fdb781f924dfa83 Mon Sep 17 00:00:00 2001 From: Alex Humesky Date: Wed, 20 Sep 2023 17:46:26 -0700 Subject: [PATCH] Migrate `user_link_flags` API usage for `--incompatible_require_linker_input_cc_api` See also https://github.com/bazelbuild/bazel/issues/10860 PiperOrigin-RevId: 567131072 Change-Id: I6e48160a91fbb3821359d37cfc78e46be260b589 --- rules/native_deps.bzl | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/rules/native_deps.bzl b/rules/native_deps.bzl index d503389c..4c90b50f 100644 --- a/rules/native_deps.bzl +++ b/rules/native_deps.bzl @@ -294,11 +294,16 @@ def _link_native_deps_if_present(ctx, cc_info, cc_toolchain, build_config, actua build_config.bin_dir, ) - link_opts = cc_info.linking_context.user_link_flags + linker_inputs = cc_info.linking_context.linker_inputs.to_list() + + link_opts = [] + for linker_input in linker_inputs: + for flag in linker_input.user_link_flags: + link_opts.append(flag) linkstamps = [] - for input in cc_info.linking_context.linker_inputs.to_list(): - linkstamps.extend(input.linkstamps) + for linker_input in linker_inputs: + linkstamps.extend(linker_input.linkstamps) linkstamps_dict = {linkstamp: None for linkstamp in linkstamps} build_info_artifacts = _get_build_info(ctx) if linkstamps_dict else []