Patch grpc to fix cares selecting the wrong source when building for darwin_arm64 cpu.

thii · philwo · commit 1782f0ae7515 · 2020-12-07T18:13:08.000+01:00
This should use constraints instead of cpu flags, but that should be fixed on the grpc repository. I just added new `config_setting`s here to keep the patch size small. This should allow building a Bazel binary for Apple Silicon hardware from an Intel Mac with: ``` USE_BAZEL_VERSION=last_green bazel build -c opt --cpu=darwin_arm64 //src:bazel ``` (This needs last green Bazel because we need recent changes to `@bazel_tools` which needs a Bazel release.) Closes bazelbuild#12594. Signed-off-by: Philipp Wollermann <philwo@google.com>
diff --git a/third_party/grpc/grpc_1.32.0.patch b/third_party/grpc/grpc_1.32.0.patch
@@ -8,6 +8,8 @@ Date:   Wed Jun 3 15:35:31 2020 +0200
     libraries
     - Add bazel mirror URL for upb and cares
     - Redirect zlib to @//third_party/zlib
+    - Add darwin_arm64 and darwin_arm64e config settings to allow
+    building for Apple Silicon
 
 diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl
 index 7bb6b8bdb9..7644107b70 100644
@@ -88,3 +90,33 @@ index 4c1dfad2e8..f63c54ddef 100644
 -    apple_rules_dependencies()
 -
 -    apple_support_dependencies()
+diff --git a/third_party/cares/cares.BUILD b/third_party/cares/cares.BUILD
+index c047f0c515..7c24fbc617 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",
