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

macOs various updates. #3578

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Conversation

devnexen
Copy link
Contributor

  • CI only for macOs arm64.
  • Fixing build issues for macOs arm64.
  • Adding macos cpu to arch api.

@rustbot
Copy link
Collaborator

rustbot commented Feb 10, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Cargo.toml Outdated
Comment on lines 109 to 110
"x86_64-apple-darwin",
"x86_64-apple-ios",
Copy link
Member

Choose a reason for hiding this comment

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

This is for docs.rs and you don't have to touch.

Comment on lines 6115 to 6116
// FIXME: 2024 edition forbids static mut, no easy fix for both nightly/stable neither
//pub static mut mach_task_self_: ::mach_port_t;
Copy link
Member

Choose a reason for hiding this comment

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

We could just remove mach related items.

Comment on lines 6230 to 6238
pub fn macho_cpu_type_for_arch_name(
archName: *const ::c_char,
tpe: *mut ::cpu_type_t,
subtpe: *mut ::cpu_subtype_t,
) -> bool;
pub fn macho_arch_name_for_cpu_type(
tpe: ::cpu_type_t,
subtpe: ::cpu_subtype_t,
) -> *const ::c_char;
Copy link
Member

Choose a reason for hiding this comment

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

These should exist on the mach crate.

@anacrolix
Copy link
Contributor

This looks great! Could we get it merged?

@@ -203,6 +203,7 @@ fn test_apple(target: &str) {
"limits.h",
"locale.h",
"malloc/malloc.h",
"mach-o/utils.h",
Copy link
Member

Choose a reason for hiding this comment

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

I think this is now unneeded, right?

@JohnTitor JohnTitor added this pull request to the merge queue Feb 28, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Feb 28, 2024
@anacrolix
Copy link
Contributor

That's an unexpected error from the merge queue.

- CI only for macOs arm64.
- Fixing build issues for macOs arm64.
- Adding macos cpu to arch api.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants