Skip to content

Infer tvOS/watchOS archs from the CPU parameters, similarly to iOS #2707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Infer tvOS/watchOS archs from the CPU parameters, similarly to iOS #2707

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
067e9bf
Default tvOS/watchOS archs to CPU, similarly to iOS
rockbruno May 6, 2025
f9fcfcf
Merge branch 'master' into patch-1
rockbruno Jun 10, 2025
7d1380d
Merge branch 'master' into patch-1
rockbruno Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions apple/internal/transition_support.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,23 @@ def _cpu_string(*, environment_arch, platform_type, settings = {}):
tvos_cpus = settings["//command_line_option:tvos_cpus"]
if tvos_cpus:
return "tvos_{}".format(tvos_cpus[0])
cpu_value = settings["//command_line_option:cpu"]
if cpu_value.startswith("tvos_"):
return cpu_value
if cpu_value == "darwin_arm64":
return "tvos_sim_arm64"
return "tvos_x86_64"
if platform_type == "watchos":
if environment_arch:
return "watchos_{}".format(environment_arch)
watchos_cpus = settings["//command_line_option:watchos_cpus"]
if watchos_cpus:
return "watchos_{}".format(watchos_cpus[0])
cpu_value = settings["//command_line_option:cpu"]
if cpu_value.startswith("watchos_"):
return cpu_value
if cpu_value == "darwin_arm64":
return "watchos_arm64"
return "watchos_x86_64"

fail("ERROR: Unknown platform type: {}".format(platform_type))
Expand Down