Skip to content

Commit d7628e1

Browse files
keithcopybara-github
authored andcommitted
Update DEFAULT_IOS_CPU for M1 arm64 simulator support
Now that bazel supports ios_sim_arm64 we can prefer this if no other iOS CPU is passed so that developers can build the simulator builds of their apps / tests without having to pass a flag depending on the host. Closes bazelbuild#13873. PiperOrigin-RevId: 405661296
1 parent 276aef3 commit d7628e1

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import com.google.devtools.build.lib.rules.apple.AppleCommandLineOptions.AppleBitcodeMode;
3535
import com.google.devtools.build.lib.rules.apple.ApplePlatform.PlatformType;
3636
import com.google.devtools.build.lib.starlarkbuildapi.apple.AppleConfigurationApi;
37+
import com.google.devtools.build.lib.util.CPU;
3738
import java.util.ArrayList;
3839
import java.util.Arrays;
3940
import java.util.EnumMap;
@@ -77,7 +78,8 @@ public class AppleConfiguration extends Fragment implements AppleConfigurationAp
7778
public static final String IOS_FORCED_SIMULATOR_CPU_PREFIX = "sim_";
7879

7980
/** Default cpu for iOS builds. */
80-
@VisibleForTesting static final String DEFAULT_IOS_CPU = "x86_64";
81+
@VisibleForTesting
82+
static final String DEFAULT_IOS_CPU = CPU.getCurrent() == CPU.AARCH64 ? "sim_arm64" : "x86_64";
8183

8284
private final PlatformType applePlatformType;
8385
private final ConfigurationDistinguisher configurationDistinguisher;

0 commit comments

Comments
 (0)