Skip to content

Commit eed702e

Browse files
authored
Remove unnecessary exported API (#2896)
This API isn't public (it's in an internal file) and there is only 1 use. This drops the unused `variables_extension` parameter and requires all other arguments be passed.
1 parent 585ba4c commit eed702e

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

apple/internal/linking_support.bzl

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,13 @@ def _archive_multi_arch_static_library(
145145
def _link_multi_arch_binary(
146146
*,
147147
ctx,
148-
avoid_deps = [],
148+
avoid_deps,
149149
cc_toolchains,
150-
extra_linkopts = [],
151-
extra_link_inputs = [],
152-
extra_requested_features = [],
153-
extra_disabled_features = [],
154-
stamp = -1,
155-
variables_extension = {}):
150+
extra_linkopts,
151+
extra_link_inputs,
152+
extra_requested_features,
153+
extra_disabled_features,
154+
stamp):
156155
"""Links a (potentially multi-architecture) binary targeting Apple platforms.
157156
158157
This method comprises a bulk of the logic of the Starlark `apple_binary`
@@ -182,8 +181,6 @@ def _link_multi_arch_binary(
182181
If -1 (the default), then the behavior is determined by the --[no]stamp
183182
flag. This should be set to 0 when generating the executable output for
184183
test rules.
185-
variables_extension: A dictionary of user-defined variables to be added to the
186-
toolchain configuration when create link command line.
187184
188185
Returns:
189186
A `struct` which contains the following fields:
@@ -318,7 +315,7 @@ def _link_multi_arch_binary(
318315
build_config = child_config,
319316
extra_link_args = extra_linkopts,
320317
stamp = stamp,
321-
user_variable_extensions = variables_extension | extensions,
318+
user_variable_extensions = extensions,
322319
additional_outputs = additional_outputs,
323320
extra_link_inputs = extra_link_inputs,
324321
attr_linkopts = attr_linkopts,
@@ -660,7 +657,6 @@ def _lipo_or_symlink_inputs(*, actions, inputs, output, apple_fragment, xcode_co
660657

661658
linking_support = struct(
662659
debug_outputs_by_architecture = _debug_outputs_by_architecture,
663-
link_multi_arch_binary = _link_multi_arch_binary,
664660
lipo_or_symlink_inputs = _lipo_or_symlink_inputs,
665661
register_binary_linking_action = _register_binary_linking_action,
666662
register_static_library_archive_action = _register_static_library_archive_action,

0 commit comments

Comments
 (0)