From 0ced4f5caa2b19c7ddb4a3bfdb39125c41127c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thi=20Do=C3=A3n?= Date: Tue, 8 Dec 2020 19:56:10 +0900 Subject: [PATCH] Add darwin_arm64 and darwin_arm64e to c-ares' config settings This fixes Bazel selecting the wrong source for `cares` when building with `--cpu=darwin_arm64` or `--cpu=darwin_arm64e` (it was selecting the source in the default condition, which is for Linux). We're having the same patch in Bazel (https://github.com/bazelbuild/bazel/commit/1782f0ae751569607ef88930c822ac460a1f8bb3; it was using an older grpc release). Fixing this here so we can remove the patch in the next update. --- third_party/cares/cares.BUILD | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/third_party/cares/cares.BUILD b/third_party/cares/cares.BUILD index 616030bc41c..7939021a254 100644 --- a/third_party/cares/cares.BUILD +++ b/third_party/cares/cares.BUILD @@ -10,6 +10,16 @@ config_setting( values = {"cpu": "darwin_x86_64"}, ) +config_setting( + name = "darwin_arm64", + values = {"cpu": "darwin_arm64"}, +) + +config_setting( + name = "darwin_arm64e", + values = {"cpu": "darwin_arm64e"}, +) + config_setting( name = "windows", values = {"cpu": "x64_windows"}, @@ -99,6 +109,8 @@ copy_file( ":watchos_arm64_32": "@com_github_grpc_grpc//third_party/cares:config_darwin/ares_config.h", ":darwin": "@com_github_grpc_grpc//third_party/cares:config_darwin/ares_config.h", ":darwin_x86_64": "@com_github_grpc_grpc//third_party/cares:config_darwin/ares_config.h", + ":darwin_arm64": "@com_github_grpc_grpc//third_party/cares:config_darwin/ares_config.h", + ":darwin_arm64e": "@com_github_grpc_grpc//third_party/cares:config_darwin/ares_config.h", ":windows": "@com_github_grpc_grpc//third_party/cares:config_windows/ares_config.h", ":android": "@com_github_grpc_grpc//third_party/cares:config_android/ares_config.h", "//conditions:default": "@com_github_grpc_grpc//third_party/cares:config_linux/ares_config.h",