Skip to content

Add darwin_arm64 and darwin_arm64e to c-ares’ config settings#24872

Merged
apolcyn merged 1 commit intogrpc:masterfrom
thii:add-darwin_arm64-and-darwin_arm64e-config_settings
Dec 10, 2020
Merged

Add darwin_arm64 and darwin_arm64e to c-ares’ config settings#24872
apolcyn merged 1 commit intogrpc:masterfrom
thii:add-darwin_arm64-and-darwin_arm64e-config_settings

Conversation

@thii
Copy link
Copy Markdown
Contributor

@thii thii commented Dec 1, 2020

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
(bazelbuild/bazel@1782f0a;
it was using an older grpc release). Fixing this here so we can remove
the patch in the next update.

@linux-foundation-easycla
Copy link
Copy Markdown

linux-foundation-easycla bot commented Dec 1, 2020

CLA Signed

The committers are authorized under a signed CLA.

@thii thii marked this pull request as ready for review December 2, 2020 08:12
@thii thii force-pushed the add-darwin_arm64-and-darwin_arm64e-config_settings branch from f7fc8f4 to 350b8d2 Compare December 2, 2020 20:10
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
(bazelbuild/bazel@1782f0a;
it was using an older grpc release). Fixing this here so we can remove
the patch in the next update.
@thii thii force-pushed the add-darwin_arm64-and-darwin_arm64e-config_settings branch from 350b8d2 to 0ced4f5 Compare December 8, 2020 11:05
@thii thii changed the title Add darwin_arm64 and darwin_arm64e config_settings Add darwin_arm64 and darwin_arm64e to c-ares’ config settings Dec 8, 2020
@thii
Copy link
Copy Markdown
Contributor Author

thii commented Dec 8, 2020

@apolcyn Friendly ping - could you take a look?

@apolcyn apolcyn added release notes: yes Indicates if PR needs to be in release notes lang/core labels Dec 10, 2020
@apolcyn
Copy link
Copy Markdown
Contributor

apolcyn commented Dec 10, 2020

I'll merge after tests complete

@apolcyn
Copy link
Copy Markdown
Contributor

apolcyn commented Dec 10, 2020

tests are green

@apolcyn apolcyn merged commit 2e702fc into grpc:master Dec 10, 2020
@thii thii deleted the add-darwin_arm64-and-darwin_arm64e-config_settings branch December 11, 2020 00:26
@thii
Copy link
Copy Markdown
Contributor Author

thii commented Dec 11, 2020

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lang/core release notes: yes Indicates if PR needs to be in release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants