Move some linkopts to crosstool features

apple/apple_binary.bzl

@@ -53,14 +53,13 @@ def _apple_binary_impl(ctx):
     bundle_loader = ctx.attr.bundle_loader
 
     extra_linkopts = []
+    extra_requested_features = []
 
     if binary_type == "dylib":
-        extra_linkopts.append("-dynamiclib")
+        extra_requested_features.append("link_dylib")
     elif binary_type == "loadable_bundle":
-        extra_linkopts.extend([
-            "-bundle",
-            "-Wl,-rpath,@loader_path/Frameworks",
-        ])
+        extra_linkopts.append("-Wl,-rpath,@loader_path/Frameworks")
+        extra_requested_features.append("link_bundle")
 
     extra_linkopts.extend([
         _linker_flag_for_sdk_dylib(dylib)
@@ -80,6 +79,7 @@ def _apple_binary_impl(ctx):
         bundle_loader = bundle_loader,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,
+        extra_requested_features = extra_requested_features,
         platform_prerequisites = None,
         rule_descriptor = None,
         stamp = ctx.attr.stamp,

apple/internal/ios_rules.bzl

@@ -226,17 +226,21 @@ def _ios_application_impl(ctx):
     )
 
     extra_linkopts = []
+    extra_requested_features = []
     if ctx.attr.sdk_frameworks:
         extra_linkopts.extend(
             collections.before_each("-framework", ctx.attr.sdk_frameworks),
         )
+    if ctx.attr.testonly:
+        extra_requested_features.append("exported_symbols")
 
     link_result = linking_support.register_binary_linking_action(
         ctx,
         avoid_deps = ctx.attr.frameworks,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,
+        extra_requested_features = extra_requested_features,
         platform_prerequisites = platform_prerequisites,
         rule_descriptor = rule_descriptor,
         stamp = ctx.attr.stamp,
@@ -863,8 +867,8 @@ def _ios_framework_impl(ctx):
     )
 
     extra_linkopts = [
-        "-dynamiclib",
-        "-Wl,-install_name,@rpath/{name}{extension}/{name}".format(
+        "-install_name",
+        "@rpath/{name}{extension}/{name}".format(
             extension = bundle_extension,
             name = bundle_name,
         ),
@@ -879,6 +883,7 @@ def _ios_framework_impl(ctx):
         entitlements = None,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,
+        extra_requested_features = ["link_dylib"],
         platform_prerequisites = platform_prerequisites,
         rule_descriptor = rule_descriptor,
         stamp = ctx.attr.stamp,

apple/internal/linking_support.bzl

@@ -102,6 +102,8 @@ def _register_binary_linking_action(
         exported_symbols_lists,
         extra_linkopts = [],
         extra_link_inputs = [],
+        extra_requested_features = [],
+        extra_disabled_features = [],
         platform_prerequisites = None,
         rule_descriptor = None,
         stamp = -1):
@@ -221,6 +223,8 @@ def _register_binary_linking_action(
         avoid_deps = all_avoid_deps,
         extra_linkopts = linkopts,
         extra_link_inputs = link_inputs,
+        extra_requested_features = extra_requested_features,
+        extra_disabled_features = extra_disabled_features,
         stamp = stamp,
     )
 

apple/internal/macos_rules.bzl

@@ -225,11 +225,16 @@ def _macos_application_impl(ctx):
         validation_mode = ctx.attr.entitlements_validation,
     )
 
+    extra_requested_features = []
+    if ctx.attr.testonly:
+        extra_requested_features.append("exported_symbols")
+
     link_result = linking_support.register_binary_linking_action(
         ctx,
         avoid_deps = ctx.attr.frameworks,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
+        extra_requested_features = extra_requested_features,
         platform_prerequisites = platform_prerequisites,
         rule_descriptor = rule_descriptor,
         stamp = ctx.attr.stamp,
@@ -520,7 +525,7 @@ def _macos_bundle_impl(ctx):
         bundle_loader = ctx.attr.bundle_loader,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
-        extra_linkopts = ["-bundle"],
+        extra_requested_features = ["link_bundle"],
         platform_prerequisites = platform_prerequisites,
         rule_descriptor = rule_descriptor,
         stamp = ctx.attr.stamp,
@@ -1015,7 +1020,6 @@ def _macos_quick_look_plugin_impl(ctx):
     )
 
     extra_linkopts = [
-        "-dynamiclib",
         "-install_name",
         "\"/Library/Frameworks/{0}.qlgenerator/{0}\"".format(ctx.attr.bundle_name),
     ]
@@ -1024,6 +1028,7 @@ def _macos_quick_look_plugin_impl(ctx):
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,
+        extra_requested_features = ["link_dylib"],
         platform_prerequisites = platform_prerequisites,
         rule_descriptor = rule_descriptor,
         stamp = ctx.attr.stamp,
@@ -2076,7 +2081,7 @@ def _macos_dylib_impl(ctx):
         # Dynamic libraries do not have entitlements.
         entitlements = None,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
-        extra_linkopts = ["-dynamiclib"],
+        extra_requested_features = ["link_dylib"],
         platform_prerequisites = platform_prerequisites,
         rule_descriptor = rule_descriptor,
         stamp = ctx.attr.stamp,

apple/internal/testing/apple_test_bundle_support.bzl

@@ -349,7 +349,6 @@ def _apple_test_bundle_impl(*, ctx, product_type):
     extra_linkopts = [
         "-framework",
         "XCTest",
-        "-bundle",
     ]
     extra_link_inputs = []
 
@@ -378,6 +377,7 @@ def _apple_test_bundle_impl(*, ctx, product_type):
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_link_inputs = extra_link_inputs,
         extra_linkopts = extra_linkopts,
+        extra_requested_features = ["link_bundle"],
         platform_prerequisites = platform_prerequisites,
         rule_descriptor = rule_descriptor,
         stamp = ctx.attr.stamp,

apple/internal/tvos_rules.bzl

@@ -210,11 +210,16 @@ def _tvos_application_impl(ctx):
         validation_mode = ctx.attr.entitlements_validation,
     )
 
+    extra_requested_features = []
+    if ctx.attr.testonly:
+        extra_requested_features.append("exported_symbols")
+
     link_result = linking_support.register_binary_linking_action(
         ctx,
         avoid_deps = ctx.attr.frameworks,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
+        extra_requested_features = extra_requested_features,
         platform_prerequisites = platform_prerequisites,
         rule_descriptor = rule_descriptor,
         stamp = ctx.attr.stamp,
@@ -801,12 +806,13 @@ def _tvos_framework_impl(ctx):
         entitlements = None,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = [
-            "-dynamiclib",
-            "-Wl,-install_name,@rpath/{name}{extension}/{name}".format(
+            "-install_name",
+            "@rpath/{name}{extension}/{name}".format(
                 extension = bundle_extension,
                 name = bundle_name,
             ),
         ],
+        extra_requested_features = ["link_dylib"],
         platform_prerequisites = platform_prerequisites,
         rule_descriptor = rule_descriptor,
         stamp = ctx.attr.stamp,

apple/internal/xcframework_rules.bzl

@@ -503,12 +503,13 @@ def _apple_xcframework_impl(ctx):
             # executables. Only macOS (which is not yet supported) is an outlier; this will require
             # changes to native Bazel linking logic for Apple binary targets.
             "-Wl,-rpath,@executable_path/Frameworks",
-            "-dynamiclib",
-            "-Wl,-install_name,@rpath/{name}{extension}/{name}".format(
+            "-install_name",
+            "@rpath/{name}{extension}/{name}".format(
                 extension = nested_bundle_extension,
                 name = bundle_name,
             ),
         ],
+        extra_requested_features = ["link_dylib"],
         platform_prerequisites = None,
         # All required knowledge for 3P facing frameworks is passed directly through the given
         # `extra_linkopts`; no rule_descriptor is needed to share with this linking action.

examples/multi_platform/Buttons/BUILD

@@ -97,6 +97,7 @@ ios_application(
         "iphone",
         "ipad",
     ],
+    features = ["exported_symbols"],
     infoplists = ["Buttons/Info.plist"],
     minimum_os_version = "11.0",
     watch_application = ":ButtonsWatch",
@@ -335,6 +336,7 @@ macos_framework(
 macos_application(
     name = "ButtonsMac",
     bundle_id = "com.google.ButtonsMac",
+    features = ["exported_symbols"],
     infoplists = ["ButtonsMac/Info.plist"],
     minimum_os_version = "12.0",
     deps = [