From a4a7115ad74126b6dde0d6142078cfce2692e968 Mon Sep 17 00:00:00 2001 From: Patrick Balestra Date: Tue, 25 Oct 2022 11:53:17 +0200 Subject: [PATCH] Infer CPUs for tvOS and watchOS when on Apple Silicon --- .../build/lib/rules/apple/AppleCommandLineOptions.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java index f8c678abf13372..e6d9128f32598c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java @@ -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 =