Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged

Conversation

thii
Copy link
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

linux-foundation-easycla bot commented Dec 1, 2020

CLA Signed

The committers are authorized under a signed CLA.

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
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
Contributor

apolcyn commented Dec 10, 2020

I'll merge after tests complete

@apolcyn
Copy link
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
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.

None yet

4 participants