From 47271553e9419a5db938b9358186696d294c4eba Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 17 Jul 2023 12:39:09 -0700 Subject: [PATCH] Remove direct use of objc linking provider (#2023) This was removed on bazel @ HEAD but still required for supporting older versions. Fixes https://github.com/bazelbuild/rules_apple/issues/2020 --- apple/apple_static_library.bzl | 8 ++++++-- apple/internal/linking_support.bzl | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apple/apple_static_library.bzl b/apple/apple_static_library.bzl index ac6e64e63e..286b50beb5 100644 --- a/apple/apple_static_library.bzl +++ b/apple/apple_static_library.bzl @@ -49,16 +49,20 @@ def _apple_static_library_impl(ctx): collect_data = True, ) - return [ + providers = [ DefaultInfo(files = depset(files_to_build), runfiles = runfiles), AppleBinaryInfo( binary = link_result.library, infoplist = None, ), - link_result.objc, link_result.output_groups, ] + if link_result.objc: + providers.append(link_result.objc) + + return providers + apple_static_library = rule( implementation = _apple_static_library_impl, attrs = dicts.add( diff --git a/apple/internal/linking_support.bzl b/apple/internal/linking_support.bzl index b638a17a76..3ffbc6e85f 100644 --- a/apple/internal/linking_support.bzl +++ b/apple/internal/linking_support.bzl @@ -213,7 +213,7 @@ def _register_binary_linking_action( binary = fat_binary, cc_info = linking_outputs.cc_info, debug_outputs_provider = linking_outputs.debug_outputs_provider, - objc = linking_outputs.objc, + objc = getattr(linking_outputs, "objc", None), outputs = linking_outputs.outputs, output_groups = linking_outputs.output_groups, ) @@ -253,7 +253,7 @@ def _register_static_library_linking_action(ctx): return struct( library = fat_library, - objc = linking_outputs.objc, + objc = getattr(linking_outputs, "objc", None), outputs = linking_outputs.outputs, output_groups = linking_outputs.output_groups, )