From b96287a13f0f54048e582feec707a10ad7635881 Mon Sep 17 00:00:00 2001 From: Param Reddy Date: Sat, 14 Oct 2017 12:43:31 -0700 Subject: Fix build for ios app using grpc as cc_library For ios build, bazel build needs to be invoked with: --ios_multi_cpu=armv7,arm64 build. This in turn gets picked as cpu based on the docs: --[no]experimental_enable_objc_cc_deps default: "true" Allows objc_* rules to depend on cc_library and causes any objc dependencies to be built with --cpu set to "ios_<--ios_cpu>" for any values in --ios_multi_cpu. This diff explicitly adds darwin config for cpu being ios_x86_64, ios_armv7, ios_armv7s and ios_arm64. We cant use ios_cpu as condition because its set to x86_64 by default and causes linux build break. --- third_party/cares/cares.BUILD | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'third_party') diff --git a/third_party/cares/cares.BUILD b/third_party/cares/cares.BUILD index 978e9b1ed9..bca1bd0d07 100644 --- a/third_party/cares/cares.BUILD +++ b/third_party/cares/cares.BUILD @@ -3,6 +3,23 @@ config_setting( values = {"cpu": "darwin"}, ) +config_setting( + name = "ios_x86_64", + values = {"cpu": "ios_x86_64"}, +) +config_setting( + name = "ios_armv7", + values = {"cpu": "ios_armv7"}, +) +config_setting( + name = "ios_armv7s", + values = {"cpu": "ios_armv7s"}, +) +config_setting( + name = "ios_arm64", + values = {"cpu": "ios_arm64"}, +) + cc_library( name = "ares", srcs = [ @@ -81,6 +98,10 @@ cc_library( "cares/nameser.h", "cares/setup_once.h", ] + select({ + ":ios_x86_64": ["config_darwin/ares_config.h"], + ":ios_armv7": ["config_darwin/ares_config.h"], + ":ios_armv7s": ["config_darwin/ares_config.h"], + ":ios_arm64": ["config_darwin/ares_config.h"], ":darwin": ["config_darwin/ares_config.h"], "//conditions:default": ["config_linux/ares_config.h"], }), @@ -88,6 +109,10 @@ cc_library( ".", "cares" ] + select({ + ":ios_x86_64": ["config_darwin"], + ":ios_armv7": ["config_darwin"], + ":ios_armv7s": ["config_darwin"], + ":ios_arm64": ["config_darwin"], ":darwin": ["config_darwin"], "//conditions:default": ["config_linux"], }), -- cgit v1.2.3