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

build: add universal Mac make target #6023

Merged
merged 5 commits into from
Jun 26, 2024
Merged

Conversation

ohill
Copy link
Contributor

@ohill ohill commented Jun 10, 2024

Summary

This adds a new universal build target that builds two libsodium libraries, runs the make build target for two architectures, and then uses lipo to merge the binaries for amd64 and arm64 together.

Test Plan

Not sure what is next, or how this would integrate into the release process. The universal binaries are roughly twice the size, but if that's a problem, the build target produces 3 bin directories (bin-darwin-amd64, bin-darwin-arm64, bin-darwin-universal) allowing for different release options.

Copy link

codecov bot commented Jun 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.85%. Comparing base (f06a86e) to head (217750e).
Report is 23 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #6023      +/-   ##
==========================================
- Coverage   55.90%   55.85%   -0.05%     
==========================================
  Files         482      482              
  Lines       68436    68436              
==========================================
- Hits        38258    38225      -33     
- Misses      27583    27612      +29     
- Partials     2595     2599       +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Makefile Outdated Show resolved Hide resolved
cce
cce previously approved these changes Jun 13, 2024
Makefile Outdated Show resolved Hide resolved
onetechnical
onetechnical previously approved these changes Jun 21, 2024
Copy link
Contributor

@onetechnical onetechnical left a comment

Choose a reason for hiding this comment

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

Thanks for this! It'd be nice to provide a single binary for Mac OS, and will help with AMD64 deprecations.

@ohill ohill dismissed stale reviews from onetechnical and cce via d0b6ded June 25, 2024 17:48
@ohill ohill requested review from onetechnical and cce June 25, 2024 17:50
gmalouf
gmalouf previously approved these changes Jun 25, 2024
onetechnical
onetechnical previously approved these changes Jun 25, 2024
algorandskiy
algorandskiy previously approved these changes Jun 25, 2024
cce
cce previously approved these changes Jun 26, 2024
@ohill ohill dismissed stale reviews from cce, algorandskiy, onetechnical, and gmalouf via 217750e June 26, 2024 13:44
@gmalouf gmalouf merged commit c99a1c9 into algorand:master Jun 26, 2024
20 checks passed
@ohill ohill deleted the universal branch June 26, 2024 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants