From 330e0f3ba8770ffceb1b7e7d34d7cd7b6896c913 Mon Sep 17 00:00:00 2001 From: Tony Allevato Date: Thu, 21 Feb 2019 09:52:17 -0800 Subject: [PATCH] Support "darwin_x86_64" CPU in cares.BUILD. Bazel recognizes both "darwin" and "darwin_x86_64" as CPU values, and the Apple Bazel rules currently recommend the latter for building macOS targets. Until this is cleaned up, this change allows grpc to build correctly when that configuration is used. Fixes #17649. --- third_party/cares/cares.BUILD | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/third_party/cares/cares.BUILD b/third_party/cares/cares.BUILD index fd14007e804..54b8c57b1d6 100644 --- a/third_party/cares/cares.BUILD +++ b/third_party/cares/cares.BUILD @@ -3,6 +3,11 @@ config_setting( values = {"cpu": "darwin"}, ) +config_setting( + name = "darwin_x86_64", + values = {"cpu": "darwin_x86_64"}, +) + config_setting( name = "windows", values = {"cpu": "x64_windows"}, @@ -54,6 +59,7 @@ genrule( ":ios_armv7s": ["@com_github_grpc_grpc//third_party/cares:config_darwin/ares_config.h"], ":ios_arm64": ["@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"], ":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"],