From d3506e7e0b029f4838177551154eb38e5ba982a4 Mon Sep 17 00:00:00 2001 From: "bazel.build machine account" <15028808+bazel-io@users.noreply.github.com> Date: Mon, 29 Jan 2024 10:35:22 +0100 Subject: [PATCH] [7.1.0] Remove visionos_x86_64 CPUs (#21022) Apple has since changed visionOS to only support arm macs Closes #20335. Commit https://github.com/bazelbuild/bazel/commit/ce9fa8eff5d4705c9f6bf6f6642fa9ed45eb0247 PiperOrigin-RevId: 601022333 Change-Id: I6322c68102129eb230bbbb4546249cb22899fe94 Co-authored-by: Keith Smiley --- .../google/devtools/build/lib/rules/apple/ApplePlatform.java | 2 +- src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl | 2 +- src/main/starlark/builtins_bzl/common/objc/objc_common.bzl | 2 +- src/main/starlark/builtins_bzl/common/objc/semantics.bzl | 1 - 4 files changed, 3 insertions(+), 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 index c34d89f62dec7a..ef550206a0201c 100644 --- 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 IOS_DEVICE_TARGET_CPUS = ImmutableSet.of("ios_armv6", "ios_arm64", "ios_armv7", "ios_armv7s", "ios_arm64e"); private static final ImmutableSet VISIONOS_SIMULATOR_TARGET_CPUS = - ImmutableSet.of("visionos_x86_64", "visionos_sim_arm64"); + ImmutableSet.of("visionos_sim_arm64"); private static final ImmutableSet VISIONOS_DEVICE_TARGET_CPUS = ImmutableSet.of("visionos_arm64"); private static final ImmutableSet 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 index 39479fe3a3ff3a..f87c07ba3f374a 100644 --- 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 index 6343db98651d64..77e5d48b2c6e27 100644 --- 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 index 9601361cbab934..a3d40913d07a0a 100644 --- 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",