Skip to content

only specify --openjdk-target when cross compiling#3923

Merged
karianna merged 1 commit intoadoptium:masterfrom
gdams:cds
Aug 25, 2024
Merged

only specify --openjdk-target when cross compiling#3923
karianna merged 1 commit intoadoptium:masterfrom
gdams:cds

Conversation

@gdams
Copy link
Copy Markdown
Member

@gdams gdams commented Aug 22, 2024 •
edited
Loading

This will partially fix adoptium/adoptium-support#937 for macOS aarch64

@github-actions
Copy link
Copy Markdown

github-actions bot commented Aug 22, 2024

Thank you for creating a pull request!
If you have not done so already, please familiarise yourself with our Contributing Guidelines and FAQ, even if you have contributed to the Adoptium project before. GitHub actions will now run a set of jobs against your PR that will lint and unit test your changes. Keep an eye out for the results from these on the latest commit you submitted. For more information, please see our testing documentation.

@github-actions github-actions bot added macos Issues that affect or relate to the MAC OS cross-compile Issues that affect or relate to cross compiled platforms (e.g. RISC-V) labels Aug 22, 2024
@gdams gdams changed the title only specific --openjdk-target when cross compiling only specify --openjdk-target when cross compiling Aug 22, 2024
@gdams

This comment was marked as outdated.

Sign in to view
@gdams gdams marked this pull request as draft August 22, 2024 12:00
@github-actions github-actions bot added the aarch Issues that affect or relate to the aarch ARCHITECTURE label Aug 22, 2024
@gdams gdams marked this pull request as ready for review August 22, 2024 12:01
sxa
sxa approved these changes Aug 22, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@sxa sxa left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I guess this was added in for cross-compiling for aarch64 on x64 hosts, which we're not doing so it makes sense to remove it in the aarch64->aarch64 case.
On that basis, I approve 👍🏻 Thanks for tracking it down.

karianna
karianna requested changes Aug 23, 2024
View reviewed changes
Comment thread build-farm/platform-specific-configurations/mac.sh
@karianna karianna merged commit 6d8db56 into adoptium:master Aug 25, 2024
@gdams gdams deleted the cds branch August 25, 2024 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@karianna karianna karianna approved these changes

@sxa sxa sxa approved these changes

Assignees

No one assigned

Labels

aarch Issues that affect or relate to the aarch ARCHITECTURE cross-compile Issues that affect or relate to cross compiled platforms (e.g. RISC-V) macos Issues that affect or relate to the MAC OS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

classes.jsa and classes_nocoops.jsa now excluded from MacOS JDKs/JREs?

3 participants

@gdams @karianna @sxa