[7.1.0] Remove visionos_x86_64 CPUs (#21022)

Apple has since changed visionOS to only support arm macs Closes #20335. Commit ce9fa8e PiperOrigin-RevId: 601022333 Change-Id: I6322c68102129eb230bbbb4546249cb22899fe94 Co-authored-by: Keith Smiley <keithbsmiley@gmail.com>
bazelbuild · Jan 29, 2024 · d3506e7 · d3506e7
1 parent 0ee114f
commit d3506e7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java b/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java
@@ -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 =

diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl
@@ -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"]

diff --git a/src/main/starlark/builtins_bzl/common/objc/objc_common.bzl b/src/main/starlark/builtins_bzl/common/objc/objc_common.bzl
@@ -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"],

diff --git a/src/main/starlark/builtins_bzl/common/objc/semantics.bzl b/src/main/starlark/builtins_bzl/common/objc/semantics.bzl
@@ -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",