Skip to content

Add support for macOS aarch64 with universal binary - #12319

Merged
shivaspeaks merged 9 commits into
grpc:masterfrom
shivaspeaks:protoc-gen
Sep 13, 2025
Merged

Add support for macOS aarch64 with universal binary#12319
shivaspeaks merged 9 commits into
grpc:masterfrom
shivaspeaks:protoc-gen

Conversation

@shivaspeaks

@shivaspeaksshivaspeaks commented Aug 28, 2025•
edited
Loading

Copy link
Copy Markdown
Member

Fixes#7690

VERIFIED:

./buildscripts/kokoro/macos.sh ...
...
BUILD SUCCESSFUL

lipo -archs $(find ./mvn-artifacts -name "protoc-gen-grpc-java-*-osx-aarch_64.exe")
x86_64 arm64

@shivaspeaksshivaspeaks changed the title add support for aarch64add support for macos aarch64Aug 28, 2025
kannanjgithub
kannanjgithub reviewed Aug 28, 2025
View reviewed changes
Comment threadbuildscripts/make_dependencies.sh
@shivaspeaks
shivaspeaks marked this pull request as ready for review August 28, 2025 15:53
ejona86
ejona86 reviewed Aug 28, 2025
View reviewed changes
Comment threadbuildscripts/kokoro/macos_aarch64.sh Outdated
Comment threadbuildscripts/make_dependencies.sh
ejona86
ejona86 reviewed Sep 3, 2025
View reviewed changes
Comment threadbuildscripts/make_dependencies.sh Outdated
Comment threadbuildscripts/kokoro/upload_artifacts.sh
Comment threadbuildscripts/kokoro/unix.sh Outdated
Comment threadcompiler/build.gradle Outdated
ejona86
ejona86 approved these changes Sep 10, 2025
View reviewed changes

@ejona86ejona86 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after reverting the upload_artifacts.sh change.

Comment threadcompiler/build.gradle Outdated
Comment threadbuildscripts/kokoro/upload_artifacts.sh
@shivaspeaksshivaspeaks added the kokoro:force-run Add this label to a PR to tell Kokoro to re-run all tests. Not generally necessary label Sep 12, 2025
@grpc-kokorogrpc-kokoro removed the kokoro:force-run Add this label to a PR to tell Kokoro to re-run all tests. Not generally necessary label Sep 12, 2025
@shivaspeaksshivaspeaks changed the title add support for macos aarch64Add support for macOS aarch64 with universal binarySep 13, 2025
@shivaspeaks
shivaspeaks merged commit fe54dd6 into grpc:masterSep 13, 2025
26 of 29 checks passed
@shivaspeaks
shivaspeaks deleted the protoc-gen branch September 13, 2025 08:07
panchenko
panchenko reviewed Sep 13, 2025
View reviewed changes
Comment threadcompiler/build.gradle
addEnvArgs("CXXFLAGS", cppCompiler.args)
addEnvArgs("CPPFLAGS", cppCompiler.args)
if (project.hasProperty('buildUniversal') &&
project.getProperty('buildUniversal').toBoolean() &&

@panchenkopanchenkoSep 13, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

project.findProperty('buildUniversal')?.toBoolean() without the previous check

@luca-schleckerluca-schlecker mentioned this pull request Sep 16, 2025
Closed
1 task
AgraVator pushed a commit to AgraVator/grpc-java that referenced this pull request Sep 26, 2025
@shivaspeaks@AgraVator
Add support for macOS aarch64 with universal binary (grpc#12319)
a6a479b
AgraVator pushed a commit to AgraVator/grpc-java that referenced this pull request Sep 26, 2025
@shivaspeaks@AgraVator
Add support for macOS aarch64 with universal binary (grpc#12319)
7facd2b
@github-actionsgithub-actionsBot locked as resolved and limited conversation to collaborators Dec 13, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@ejona86ejona86ejona86 approved these changes
@kannanjgithubkannanjgithubAwaiting requested review from kannanjgithub
+1 more reviewer
@panchenkopanchenkopanchenko left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

protoc-gen-grpc-java not available on apple m1

5 participants

@shivaspeaks@panchenko@ejona86@kannanjgithub@grpc-kokoro