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

Fix aarch64-apple-darwin fallback to x86_64h #1278

Merged
merged 1 commit into from
Aug 11, 2023
Merged

Conversation

NobodyXu
Copy link
Member

Partially resolve #1277

Run arch -arch x86_64h /usr/bin/true to decides whether fallback is feasible.

Run `arch -arch x86_64h /usr/bin/true` to decides whether fallback
is feasible.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
// These two tasks are never cancelled, so it can only fail due to
// panic, in which cause we would propagate by also panic here.
let x86_64h_task = tokio::spawn(is_arch_supported("x86_64h"));
let x86_64_task = tokio::spawn(is_arch_supported("x86_64"));
[
// Prefer universal as it provides native arm executable
Copy link
Member

Choose a reason for hiding this comment

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

Hmm unrelated to this PR but I wonder about that, given that universal can contain anything really. Like you could have a x64 and x64h universal with no arm

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, according to bjorn3 on zulip it could even have a PowerPC and m68k binary inside.

@NobodyXu NobodyXu added this pull request to the merge queue Aug 11, 2023
Merged via the queue into main with commit a848449 Aug 11, 2023
26 checks passed
@NobodyXu NobodyXu deleted the fix-x86_64h-detect branch August 11, 2023 01:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

x86_64h-apple-darwin failed to execute on my M1
2 participants