Skip to content
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

Jump to bottom

Infer CPUs for tvOS and watchOS when on Apple Silicon #16547

Closed
wants to merge 1 commit into from
Closed

Infer CPUs for tvOS and watchOS when on Apple Silicon #16547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,12 @@ public class AppleCommandLineOptions extends FragmentOptions {
@VisibleForTesting static final String DEFAULT_IOS_CPU = "x86_64";

/** The default watchos CPU value. */
public static final String DEFAULT_WATCHOS_CPU = "i386";
public static final String DEFAULT_WATCHOS_CPU =
CPU.getCurrent() == CPU.AARCH64 ? "arm64" : "i386";

/** The default tvOS CPU value. */
public static final String DEFAULT_TVOS_CPU = "x86_64";
public static final String DEFAULT_TVOS_CPU =
CPU.getCurrent() == CPU.AARCH64 ? "sim_arm64" : "x86_64";

/** The default macOS CPU value. */
public static final String DEFAULT_MACOS_CPU =
Expand Down