Temporarily patch architecture confusion when cross-compiling on mac #3619
Conversation
Currently, when we build an x64 mac build on an arm64 machine, we put arm64 all over the place by mistake. This change is to partially compensate for that mistake until such time as we can impliment a comprehensive seperation of build architecture and target architecture in our build scripts. Signed-off-by: Adam Farley <adfarley@redhat.com>
github-actions
bot
added
arm
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
A block has been put on this Pull Request as this repository is temporarily under a code freeze due to an ongoing release cycle.
If this pull request needs to be merged during the release cycle then please comment /merge and a PMC member will be able to remove the block.
If the code freeze is over you can remove this block by commenting /thaw.
|
Fixes #3602 |
Signed-off-by: Adam Farley <adfarley@redhat.com>
Signed-off-by: Adam Farley <adfarley@redhat.com>
Signed-off-by: Adam Farley <adfarley@redhat.com>
|
Ok, the static libs fix worked, but the SBOM fix did not. I've amended the code. Rebuilding: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk21u/job/jdk21u-mac-x64-temurin/93/ Edit: Still doesn't work, and I suspect the absence of an uppercase A in "arm64" means this value is not being set in build.sh, despite the caret after the variable name (${variable^}). Rerunning with debug info: https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk21u/job/jdk21u-mac-x64-temurin/96/console |
Signed-off-by: Adam Farley <adfarley@redhat.com>
Signed-off-by: Adam Farley <adfarley@redhat.com>
Signed-off-by: Adam Farley <adfarley@redhat.com>
Signed-off-by: Adam Farley <adfarley@redhat.com>
adamfarley
changed the title
|
Works now. Ready to merge. |
|
/thaw |
github-actions
bot
dismissed
their stale review
Pull Request unblocked - code freeze is over.
Currently, when we build an x64 mac build on an arm64 machine, we put arm64 all over the place by mistake.
This change is to partially compensate for that mistake until such time as we can implement a comprehensive separation of build architecture and target architecture in our build scripts.