Remove upstream get_cpu usage (#2670)

Manual cherry pick of 0410c02

Fixes past
bazelbuild/bazel@4f40b7f

Author: keith

.bazelci/presubmit.yml

@@ -50,7 +50,7 @@ tasks:
 
   macos_last_green:
     name: "Last Green Bazel"
-    bazel: 4c2d91e762ab6e492853b021408129dd93fb5904 # TODO: Switch back to last_green once get_cpu has been removed
+    bazel: last_green
     <<: *common
 
   doc_tests:

apple/apple_binary.bzl

@@ -65,6 +65,7 @@ Resolved Xcode is version {xcode_version}.
 
     binary_type = ctx.attr.binary_type
     bundle_loader = ctx.attr.bundle_loader
+    cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
 
     extra_linkopts = []
 
@@ -91,6 +92,7 @@ Resolved Xcode is version {xcode_version}.
 
     link_result = linking_support.register_binary_linking_action(
         ctx,
+        cc_toolchains = cc_toolchain_forwarder,
         bundle_loader = bundle_loader,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
         extra_linkopts = extra_linkopts,

apple/apple_static_library.bzl

@@ -64,9 +64,13 @@ Expected Apple platform type of "{platform_type}", but that was not found in {to
                 toolchain_key = toolchain_key,
             ))
 
-    link_result = linking_support.register_static_library_linking_action(ctx = ctx)
+    cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
+    archive_result = linking_support.register_static_library_archive_action(
+        ctx = ctx,
+        cc_toolchains = cc_toolchain_forwarder,
+    )
 
-    files_to_build = [link_result.library]
+    files_to_build = [archive_result.library]
     runfiles = ctx.runfiles(
         files = files_to_build,
         collect_default = True,
@@ -76,14 +80,14 @@ Expected Apple platform type of "{platform_type}", but that was not found in {to
     providers = [
         DefaultInfo(files = depset(files_to_build), runfiles = runfiles),
         new_applebinaryinfo(
-            binary = link_result.library,
+            binary = archive_result.library,
             infoplist = None,
         ),
-        link_result.output_groups,
+        archive_result.output_groups,
     ]
 
-    if link_result.objc:
-        providers.append(link_result.objc)
+    if archive_result.objc:
+        providers.append(archive_result.objc)
 
     return providers
 
@@ -108,10 +112,7 @@ implementation of `apple_static_library` in Bazel core so that it can be removed
     },
     attrs = [
         rule_attrs.common_tool_attrs(),
-        rule_attrs.cc_toolchain_forwarder_attrs(
-            deps_cfg = transition_support.apple_platform_split_transition,
-        ),
-        rule_attrs.static_library_linking_attrs(
+        rule_attrs.static_library_archive_attrs(
             deps_cfg = transition_support.apple_platform_split_transition,
         ),
         {

apple/internal/ios_rules.bzl

@@ -240,6 +240,7 @@ def _ios_application_impl(ctx):
 
     link_result = linking_support.register_binary_linking_action(
         ctx,
+        cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -557,6 +558,7 @@ def _ios_app_clip_impl(ctx):
         suffix_default = ctx.attr._bundle_id_suffix_default,
         shared_capabilities = ctx.attr.shared_capabilities,
     )
+    cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
     bundle_verification_targets = [struct(target = ext) for ext in ctx.attr.extensions]
     embeddable_targets = (
         ctx.attr.frameworks +
@@ -613,6 +615,7 @@ def _ios_app_clip_impl(ctx):
 
     link_result = linking_support.register_binary_linking_action(
         ctx,
+        cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -877,6 +880,7 @@ def _ios_framework_impl(ctx):
         suffix_default = ctx.attr._bundle_id_suffix_default,
     )
     cc_toolchain = find_cpp_toolchain(ctx)
+    cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
     cc_features = cc_common.configure_features(
         ctx = ctx,
         cc_toolchain = cc_toolchain,
@@ -935,6 +939,7 @@ def _ios_framework_impl(ctx):
 
     link_result = linking_support.register_binary_linking_action(
         ctx,
+        cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         # Frameworks do not have entitlements.
         entitlements = None,
@@ -1149,6 +1154,7 @@ def _ios_extension_impl(ctx):
         suffix_default = ctx.attr._bundle_id_suffix_default,
         shared_capabilities = ctx.attr.shared_capabilities,
     )
+    cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
     features = features_support.compute_enabled_features(
         requested_features = ctx.features,
         unsupported_features = ctx.disabled_features,
@@ -1210,6 +1216,7 @@ def _ios_extension_impl(ctx):
 
     link_result = linking_support.register_binary_linking_action(
         ctx,
+        cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -1461,6 +1468,7 @@ def _ios_dynamic_framework_impl(ctx):
     )
     executable_name = ctx.attr.executable_name
     cc_toolchain = find_cpp_toolchain(ctx)
+    cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
     cc_features = cc_common.configure_features(
         ctx = ctx,
         cc_toolchain = cc_toolchain,
@@ -1525,6 +1533,7 @@ def _ios_dynamic_framework_impl(ctx):
 
     link_result = linking_support.register_binary_linking_action(
         ctx,
+        cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         # Frameworks do not have entitlements.
         entitlements = None,
@@ -1774,8 +1783,11 @@ def _ios_static_framework_impl(ctx):
     )
     resource_deps = ctx.attr.deps + ctx.attr.resources
 
-    link_result = linking_support.register_static_library_linking_action(ctx = ctx)
-    binary_artifact = link_result.library
+    archive_result = linking_support.register_static_library_archive_action(
+        ctx = ctx,
+        cc_toolchains = cc_toolchain_forwarder,
+    )
+    binary_artifact = archive_result.library
 
     processor_partials = [
         partials.apple_bundle_info_partial(
@@ -2101,6 +2113,7 @@ def _ios_imessage_extension_impl(ctx):
         shared_capabilities = ctx.attr.shared_capabilities,
     )
     executable_name = ctx.attr.executable_name
+    cc_toolchain_forwarder = ctx.split_attr._cc_toolchain_forwarder
     features = features_support.compute_enabled_features(
         requested_features = ctx.features,
         unsupported_features = ctx.disabled_features,
@@ -2156,6 +2169,7 @@ def _ios_imessage_extension_impl(ctx):
 
     link_result = linking_support.register_binary_linking_action(
         ctx,
+        cc_toolchains = cc_toolchain_forwarder,
         avoid_deps = ctx.attr.frameworks,
         entitlements = entitlements.linking,
         exported_symbols_lists = ctx.files.exported_symbols_lists,
@@ -2565,9 +2579,6 @@ ios_application = rule_factory.create_apple_rule(
             is_test_supporting_rule = False,
             requires_legacy_cc_toolchain = True,
         ),
-        rule_attrs.cc_toolchain_forwarder_attrs(
-            deps_cfg = transition_support.apple_platform_split_transition,
-        ),
         rule_attrs.common_bundle_attrs(deps_cfg = transition_support.apple_platform_split_transition),
         rule_attrs.common_tool_attrs(),
         rule_attrs.device_family_attrs(
@@ -2756,9 +2767,6 @@ However, iOS 14 introduced Widget Extensions that use a traditional `main` entry
             is_test_supporting_rule = False,
             requires_legacy_cc_toolchain = True,
         ),
-        rule_attrs.cc_toolchain_forwarder_attrs(
-            deps_cfg = transition_support.apple_platform_split_transition,
-        ),
         rule_attrs.common_bundle_attrs(
             deps_cfg = transition_support.apple_platform_split_transition,
         ),
@@ -2989,9 +2997,6 @@ i.e. `--features=-swift.no_generated_header`).""",
             is_test_supporting_rule = False,
             requires_legacy_cc_toolchain = True,
         ),
-        rule_attrs.cc_toolchain_forwarder_attrs(
-            deps_cfg = _STATIC_FRAMEWORK_DEPS_CFG,
-        ),
         rule_attrs.common_bundle_attrs(
             deps_cfg = _STATIC_FRAMEWORK_DEPS_CFG,
         ),