Fix ios_multi_cpus

bazelbuild · Sep 25, 2024 · 62625c6 · 62625c6
1 parent e12f3a5
commit 62625c6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/apple/internal/transition_support.bzl b/apple/internal/transition_support.bzl
@@ -246,6 +246,10 @@ def _command_line_options(
         settings = settings,
     )
 
+    ios_multi_cpus = cpu[4:] if platform_type == "ios" else (
+        settings["//command_line_option:ios_multi_cpus"] if "//command_line_option:ios_multi_cpus" in settings else []
+    )
+
     default_platforms = [settings[_CPU_TO_DEFAULT_PLATFORM_FLAG[cpu]]] if _is_bazel_7 else []
     return {
         build_settings_labels.use_tree_artifacts_outputs: force_bundle_outputs if force_bundle_outputs else settings[build_settings_labels.use_tree_artifacts_outputs],
@@ -268,6 +272,7 @@ def _command_line_options(
             platform = "ios",
             platform_type = platform_type,
         ),
+        "//command_line_option:ios_multi_cpus": ios_multi_cpus,
         "//command_line_option:macos_minimum_os": _min_os_version_or_none(
             minimum_os_version = minimum_os_version,
             platform = "macos",
@@ -417,6 +422,7 @@ _apple_rule_base_transition_outputs = [
     "//command_line_option:fission",
     "//command_line_option:grte_top",
     "//command_line_option:ios_minimum_os",
+    "//command_line_option:ios_multi_cpus",
     "//command_line_option:macos_minimum_os",
     "//command_line_option:minimum_os_version",
     "//command_line_option:platforms",
@@ -425,7 +431,6 @@ _apple_rule_base_transition_outputs = [
     "@build_bazel_rules_swift//swift:emit_swiftinterface",
 ]
 _apple_universal_binary_rule_transition_outputs = _apple_rule_base_transition_outputs + [
-    "//command_line_option:ios_multi_cpus",
     "//command_line_option:macos_cpus",
     "//command_line_option:tvos_cpus",
     "//command_line_option:watchos_cpus",