From d4e8b6852900867263d75aeeaf77ad5423c6bb51 Mon Sep 17 00:00:00 2001 From: Steeve Morin Date: Fri, 31 May 2019 07:41:25 -0700 Subject: [PATCH] Fix ios, tvos and watchos arm64 constraints They were using the `:arm` constraint, which looks like a bug. Fixes #8520 Closes #8522. PiperOrigin-RevId: 250883517 --- tools/osx/crosstool/osx_archs.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/osx/crosstool/osx_archs.bzl b/tools/osx/crosstool/osx_archs.bzl index 4f6bdc03dc199d..8c37eb012681a7 100644 --- a/tools/osx/crosstool/osx_archs.bzl +++ b/tools/osx/crosstool/osx_archs.bzl @@ -45,9 +45,9 @@ OSX_TOOLS_CONSTRAINTS = { "tvos_x86_64": ["@bazel_tools//platforms:ios", "@bazel_tools//platforms:x86_64"], "armeabi-v7a": ["@bazel_tools//platforms:arm"], "ios_armv7": ["@bazel_tools//platforms:ios", "@bazel_tools//platforms:arm"], - "ios_arm64": ["@bazel_tools//platforms:ios", "@bazel_tools//platforms:arm"], - "ios_arm64e": ["@bazel_tools//platforms:ios", "@bazel_tools//platforms:arm"], + "ios_arm64": ["@bazel_tools//platforms:ios", "@bazel_tools//platforms:aarch64"], + "ios_arm64e": ["@bazel_tools//platforms:ios", "@bazel_tools//platforms:aarch64"], "watchos_armv7k": ["@bazel_tools//platforms:ios", "@bazel_tools//platforms:arm"], - "watchos_arm64_32": ["@bazel_tools//platforms:ios", "@bazel_tools//platforms:arm"], - "tvos_arm64": ["@bazel_tools//platforms:ios", "@bazel_tools//platforms:arm"], + "watchos_arm64_32": ["@bazel_tools//platforms:ios", "@bazel_tools//platforms:aarch64"], + "tvos_arm64": ["@bazel_tools//platforms:ios", "@bazel_tools//platforms:aarch64"], }