Feature: Build macOS build as a universal binary #8577
Merged
+42
−19
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
orudge
force-pushed
the
universal-mac
branch
3 times, most recently
from
0e890f8 to
e4d3975
Compare
TrueBrain
reviewed
Jan 15, 2021
orudge
force-pushed
the
universal-mac
branch
2 times, most recently
from
ea7d17b to
8a644fb
Compare
TrueBrain
previously approved these changes
Jan 15, 2021
orudge
force-pushed
the
universal-mac
branch
2 times, most recently
from
c00eba8 to
63ad5d2
Compare
|
@TrueBrain This is now building correctly on my account, should be good for merging. |
TrueBrain
approved these changes
Jan 15, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation / Problem
We can't easily detect whether the user is using an Intel or M1 Mac for our Downloads page at this time. (Both Firefox and Safari return "Intel" on Apple Silicon, I believe Chrome does too, despite these being native apps.) To avoid user confusion, and to make it easier for users to transfer OpenTTD between machines, I propose building the Mac application as a Universal binary.
Description
This involves building each version (x86_64, arm64) separately then using the
lipotool to glue the binaries together before packing and signing. Unfortunately this will roughly double the build time, and increase the resulting .dmg size by around 50%. The code is also not quite as elegant as what was there before.I did consider building each version in separate build agents (in parallel) then glueing them together in a separate job, but as TrueBrain has found out, this is not as straightforward as we might like, and I think at this time isn't worth the effort trying to fix. Not to say it couldn't be changed in the future of course.