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.

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

Remove visionos_x86_64 CPUs #20335

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public enum ApplePlatform implements ApplePlatformApi {
private static final ImmutableSet<String> IOS_DEVICE_TARGET_CPUS =
ImmutableSet.of("ios_armv6", "ios_arm64", "ios_armv7", "ios_armv7s", "ios_arm64e");
private static final ImmutableSet<String> VISIONOS_SIMULATOR_TARGET_CPUS =
ImmutableSet.of("visionos_x86_64", "visionos_sim_arm64");
ImmutableSet.of("visionos_sim_arm64");
private static final ImmutableSet<String> VISIONOS_DEVICE_TARGET_CPUS =
ImmutableSet.of("visionos_arm64");
private static final ImmutableSet<String> WATCHOS_SIMULATOR_TARGET_CPUS =
Expand Down
2 changes: 1 addition & 1 deletion src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ _DYNAMIC_LIBRARY = "dynamic_library"

_IOS_SIMULATOR_TARGET_CPUS = ["ios_x86_64", "ios_i386", "ios_sim_arm64"]
_IOS_DEVICE_TARGET_CPUS = ["ios_armv6", "ios_arm64", "ios_armv7", "ios_armv7s", "ios_arm64e"]
_VISIONOS_SIMULATOR_TARGET_CPUS = ["visionos_x86_64", "visionos_sim_arm64"]
_VISIONOS_SIMULATOR_TARGET_CPUS = ["visionos_sim_arm64"]
_VISIONOS_DEVICE_TARGET_CPUS = ["visionos_arm64"]
_WATCHOS_SIMULATOR_TARGET_CPUS = ["watchos_i386", "watchos_x86_64", "watchos_arm64"]
_WATCHOS_DEVICE_TARGET_CPUS = ["watchos_armv7k", "watchos_arm64_32"]
Expand Down
2 changes: 1 addition & 1 deletion src/main/starlark/builtins_bzl/common/objc/objc_common.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ NON_ARC_SRCS = [".m", ".mm"]
ios_cpus = struct(
IOS_SIMULATOR_TARGET_CPUS = ["ios_x86_64", "ios_i386", "ios_sim_arm64"],
IOS_DEVICE_TARGET_CPUS = ["ios_armv6", "ios_arm64", "ios_armv7", "ios_armv7s", "ios_arm64e"],
VISIONOS_SIMULATOR_TARGET_CPUS = ["visionos_x86_64", "visionos_sim_arm64"],
VISIONOS_SIMULATOR_TARGET_CPUS = ["visionos_sim_arm64"],
VISIONOS_DEVICE_TARGET_CPUS = ["visionos_arm64"],
WATCHOS_SIMULATOR_TARGET_CPUS = ["watchos_i386", "watchos_x86_64", "watchos_arm64"],
WATCHOS_DEVICE_TARGET_CPUS = ["watchos_armv7k", "watchos_arm64_32", "watchos_device_arm64", "watchos_device_arm64e"],
Expand Down
1 change: 0 additions & 1 deletion src/main/starlark/builtins_bzl/common/objc/semantics.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ _CPU_TO_PLATFORM = {
"tvos_x86_64": "@build_bazel_apple_support//platforms:tvos_x86_64",
"visionos_arm64": "@build_bazel_apple_support//platforms:visionos_arm64",
"visionos_sim_arm64": "@build_bazel_apple_support//platforms:visionos_sim_arm64",
"visionos_x86_64": "@build_bazel_apple_support//platforms:visionos_x86_64",
"watchos_armv7k": "@build_bazel_apple_support//platforms:watchos_armv7k",
"watchos_arm64": "@build_bazel_apple_support//platforms:watchos_arm64",
"watchos_device_arm64": "@build_bazel_apple_support//platforms:watchos_arm64",
Expand Down
Loading