Build: Mac: Fix universal build to contain both archs #2825
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
One of the last-minute changes broke the universal build and resulted in a universal build which only contained a single architecture. The reason was that the added `distclean` action removed the artifact for the first architecture. This change moves the intermediate artifacts to a temporary, already defined directory which is definitely not touched by `make distclean`. Related: jamulussoftware#2808 (comment) Related: jamulussoftware#2808 (comment)
This should prevent any silent build failures result in an incomplete output.
hoffie
force-pushed
the
autobuild-fix-mac-universal-build
branch
from
8c06d6b
to
c9c18f1
Compare
pljones
reviewed
Aug 29, 2022
| file_output=$(file "${build_path}/${target_name}.app/Contents/MacOS/${target_name}") | ||
| echo "${file_output}" | ||
| for target_arch in "${target_archs_array[@]}"; do | ||
| if ! grep -q "for architecture ${target_arch}" <<< "${file_output}"; then |
pljones
approved these changes
Aug 29, 2022
ann0see
approved these changes
Aug 30, 2022
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.
Short description of changes
Build: Mac: Fix universal build to contain both archs
One of the last-minute changes broke the universal build and resulted in a universal build which only contained a single architecture. The reason was that the added
distcleanaction removed the artifact for the first architecture.This change moves the intermediate artifacts to a temporary, already defined directory which is definitely not touched by
make distclean.Build: Mac: Fail if universal build lacks an expected architecture
This should prevent any silent build failures result in an incomplete output.
CHANGELOG: Build: Mac: Combined Intel & M1 builds into a single Universal binary and improved M1 -dev build user-friendliness by introducing ad-hoc signing support
Context: Fixes an issue?
Related: #2808 (comment)
Related: #2808 (comment)
Does this change need documentation? What needs to be documented and how?
No.
Status of this Pull Request
What is missing until this pull request can be merged?
Confirmation by @ann0see (Logs look good).
Checklist