Move some linkopts to features

crosstool/cc_toolchain_config.bzl

@@ -911,6 +911,38 @@ please file an issue at https://github.com/bazelbuild/apple_support/issues/new
         ],
     )
 
+    link_dylib_feature = feature(
+        name = "link_dylib",
+        flag_sets = [
+            flag_set(
+                actions = _DYNAMIC_LINK_ACTIONS,
+                flag_groups = [
+                    flag_group(
+                        flags = [
+                            "-dynamiclib",
+                        ],
+                    ),
+                ],
+            ),
+        ],
+    )
+
+    link_bundle_feature = feature(
+        name = "link_bundle",
+        flag_sets = [
+            flag_set(
+                actions = _DYNAMIC_LINK_ACTIONS,
+                flag_groups = [
+                    flag_group(
+                        flags = [
+                            "-bundle",
+                        ],
+                    ),
+                ],
+            ),
+        ],
+    )
+
     no_deduplicate_feature = feature(
         name = "no_deduplicate",
         enabled = True,
@@ -2400,6 +2432,8 @@ please file an issue at https://github.com/bazelbuild/apple_support/issues/new
         reproducible_linker_flag_feature,
         layering_check_feature,
         external_include_paths_feature,
+        link_dylib_feature,
+        link_bundle_feature,
     ]
 
     if (ctx.attr.cpu == "darwin_x86_64" or

test/linking_support.bzl

@@ -415,12 +415,13 @@ def _register_configuration_specific_link_actions_with_objc_variables(
     else:
         return binary
 
-def _build_feature_configuration(common_variables):
+def _build_feature_configuration(common_variables, extra_requested_features):
     ctx = common_variables.ctx
 
     enabled_features = []
     enabled_features.extend(ctx.features)
     enabled_features.extend(common_variables.extra_enabled_features)
+    enabled_features.extend(extra_requested_features)
 
     disabled_features = []
     disabled_features.extend(ctx.disabled_features)
@@ -452,9 +453,13 @@ def _register_configuration_specific_link_actions(
         user_variable_extensions,
         additional_outputs,
         extra_link_inputs,
-        attr_linkopts):
+        attr_linkopts,
+        extra_requested_features):
     ctx = common_variables.ctx
-    feature_configuration = _build_feature_configuration(common_variables)
+    feature_configuration = _build_feature_configuration(
+        common_variables,
+        extra_requested_features,
+    )
 
     if _emit_builtin_objc_strip_action(ctx):
         binary = ctx.actions.declare_shareable_artifact(
@@ -501,13 +506,14 @@ def _register_configuration_specific_link_actions(
             attr_linkopts,
         )
 
-def link_multi_arch_binary(*, ctx, cc_toolchains, stamp = -1):
+def link_multi_arch_binary(*, ctx, cc_toolchains, stamp = -1, extra_requested_features):
     """Copied from rules_apple.
 
     Args:
         ctx: rule ctx
         cc_toolchains: split toolchain attr
         stamp: See upstream docs
+        extra_requested_features: Additional C++ toolchain features to request
 
     Returns:
         struct of linking info
@@ -623,6 +629,7 @@ def link_multi_arch_binary(*, ctx, cc_toolchains, stamp = -1):
                 additional_outputs = additional_outputs,
                 extra_link_inputs = [],
                 attr_linkopts = attr_linkopts,
+                extra_requested_features = extra_requested_features,
             )
 
         output = {
@@ -660,7 +667,10 @@ def _build_fully_linked_variable_extensions(*, archive, libs):
 
 def _register_fully_link_action(*, cc_linking_context, common_variables, name):
     ctx = common_variables.ctx
-    feature_configuration = _build_feature_configuration(common_variables)
+    feature_configuration = _build_feature_configuration(
+        common_variables,
+        extra_requested_features = [],
+    )
 
     libraries_to_link = _libraries_from_linking_context(cc_linking_context).to_list()
     libraries = _get_libraries_for_linking(libraries_to_link)

test/linking_tests.bzl

@@ -621,3 +621,35 @@ def linking_test_suite(name):
         mnemonic = "CppArchive",
         target_under_test = "//test/test_data:static_lib",
     )
+
+    default_test(
+        name = "{}_dylib_test".format(name),
+        tags = [name],
+        expected_argv = [
+            "-Xlinker",
+            "-objc_abi_version",
+            "-Xlinker",
+            "2",
+            "-ObjC",
+            "-dynamiclib",
+        ],
+        not_expected_argv = ["-bundle"],
+        mnemonic = "ObjcLink",
+        target_under_test = "//test/test_data:macos_dylib",
+    )
+
+    default_test(
+        name = "{}_loadable_bundle_test".format(name),
+        tags = [name],
+        expected_argv = [
+            "-Xlinker",
+            "-objc_abi_version",
+            "-Xlinker",
+            "2",
+            "-ObjC",
+            "-bundle",
+        ],
+        not_expected_argv = ["-dynamiclib"],
+        mnemonic = "ObjcLink",
+        target_under_test = "//test/test_data:macos_loadable_bundle",
+    )

test/starlark_apple_binary.bzl

@@ -4,10 +4,17 @@ load("//test:linking_support.bzl", "link_multi_arch_binary")
 load("//test:transitions.bzl", "apple_platform_split_transition")
 
 def _starlark_apple_binary_impl(ctx):
+    extra_requested_features = []
+    if ctx.attr.binary_type == "dylib":
+        extra_requested_features.append("link_dylib")
+    elif ctx.attr.binary_type == "loadable_bundle":
+        extra_requested_features.append("link_bundle")
+
     link_result = link_multi_arch_binary(
         ctx = ctx,
         cc_toolchains = ctx.split_attr._cc_toolchain_forwarder,
         stamp = ctx.attr.stamp,
+        extra_requested_features = extra_requested_features,
     )
     processed_binary = ctx.actions.declare_file(
         "{}_lipobin".format(ctx.label.name),
@@ -62,7 +69,10 @@ starlark_apple_binary = rule(
                 name = "xcode_config_label",
             ),
         ),
-        "binary_type": attr.string(default = "executable"),
+        "binary_type": attr.string(
+            default = "executable",
+            values = ["dylib", "executable", "loadable_bundle"],
+        ),
         "bundle_loader": attr.label(),
         "deps": attr.label_list(
             cfg = apple_platform_split_transition,

test/test_data/BUILD

@@ -78,6 +78,24 @@ objc_library(
     tags = TARGETS_UNDER_TEST_TAGS,
 )
 
+starlark_apple_binary(
+    name = "macos_dylib",
+    binary_type = "dylib",
+    minimum_os_version = "13.0",
+    platform_type = "macos",
+    tags = TARGETS_UNDER_TEST_TAGS,
+    deps = [":cc_lib"],
+)
+
+starlark_apple_binary(
+    name = "macos_loadable_bundle",
+    binary_type = "loadable_bundle",
+    minimum_os_version = "13.0",
+    platform_type = "macos",
+    tags = TARGETS_UNDER_TEST_TAGS,
+    deps = [":cc_lib"],
+)
+
 objc_library(
     name = "objc_lib",
     srcs = ["objc_lib.m"],

test/test_data/toolchain_configs/darwin_arm64.json

@@ -3134,6 +3134,98 @@
       "requires": [],
       "type_name": "feature"
     },
+    {
+      "enabled": true,
+      "env_sets": [],
+      "flag_sets": [
+        {
+          "actions": [
+            "c++-link-dynamic-library",
+            "c++-link-executable",
+            "c++-link-nodeps-dynamic-library",
+            "lto-index-for-dynamic-library",
+            "lto-index-for-executable",
+            "lto-index-for-nodeps-dynamic-library",
+            "objc-executable"
+          ],
+          "flag_groups": [
+            {
+              "expand_if_available": null,
+              "expand_if_equal": null,
+              "expand_if_false": null,
+              "expand_if_not_available": null,
+              "expand_if_true": null,
+              "flag_groups": [],
+              "flags": [
+                "-dynamiclib"
+              ],
+              "iterate_over": null,
+              "type_name": "flag_group"
+            }
+          ],
+          "type_name": "flag_set",
+          "with_features": []
+        }
+      ],
+      "implies": [],
+      "name": "__link_dylib_wrapper",
+      "provides": [],
+      "requires": [
+        {
+          "features": [
+            "link_dylib"
+          ],
+          "type_name": "feature_set"
+        }
+      ],
+      "type_name": "feature"
+    },
+    {
+      "enabled": true,
+      "env_sets": [],
+      "flag_sets": [
+        {
+          "actions": [
+            "c++-link-dynamic-library",
+            "c++-link-executable",
+            "c++-link-nodeps-dynamic-library",
+            "lto-index-for-dynamic-library",
+            "lto-index-for-executable",
+            "lto-index-for-nodeps-dynamic-library",
+            "objc-executable"
+          ],
+          "flag_groups": [
+            {
+              "expand_if_available": null,
+              "expand_if_equal": null,
+              "expand_if_false": null,
+              "expand_if_not_available": null,
+              "expand_if_true": null,
+              "flag_groups": [],
+              "flags": [
+                "-bundle"
+              ],
+              "iterate_over": null,
+              "type_name": "flag_group"
+            }
+          ],
+          "type_name": "flag_set",
+          "with_features": []
+        }
+      ],
+      "implies": [],
+      "name": "__link_bundle_wrapper",
+      "provides": [],
+      "requires": [
+        {
+          "features": [
+            "link_bundle"
+          ],
+          "type_name": "feature_set"
+        }
+      ],
+      "type_name": "feature"
+    },
     {
       "enabled": true,
       "env_sets": [],
@@ -5284,6 +5376,26 @@
       "requires": [],
       "type_name": "feature"
     },
+    {
+      "enabled": false,
+      "env_sets": [],
+      "flag_sets": [],
+      "implies": [],
+      "name": "link_dylib",
+      "provides": [],
+      "requires": [],
+      "type_name": "feature"
+    },
+    {
+      "enabled": false,
+      "env_sets": [],
+      "flag_sets": [],
+      "implies": [],
+      "name": "link_bundle",
+      "provides": [],
+      "requires": [],
+      "type_name": "feature"
+    },
     {
       "enabled": false,
       "env_sets": [],