Switch default CPU to use host (#1154)

keith · web-flow · commit 99e5b631bf06 · 2021-11-29T10:37:12.000-08:00
diff --git a/apple/internal/transition_support.bzl b/apple/internal/transition_support.bzl
@@ -41,13 +41,18 @@ def _cpu_string(*, cpu, platform_type, settings = {}):
         cpu_value = settings["//command_line_option:cpu"]
         if cpu_value.startswith("ios_"):
             return cpu_value
+        if cpu_value == "darwin_arm64":
+            return "ios_sim_arm64"
         return "ios_x86_64"
     if platform_type == "macos":
         if cpu:
             return "darwin_{}".format(cpu)
         macos_cpus = settings["//command_line_option:macos_cpus"]
         if macos_cpus:
             return "darwin_{}".format(macos_cpus[0])
+        cpu_value = settings["//command_line_option:cpu"]
+        if cpu_value.startswith("darwin_"):
+            return cpu_value
         return "darwin_x86_64"
     if platform_type == "tvos":
         if cpu:
