-
Notifications
You must be signed in to change notification settings - Fork 1k
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
macOs various updates. #3578
Conversation
devnexen
commented
Feb 10, 2024
- CI only for macOs arm64.
- Fixing build issues for macOs arm64.
- Adding macos cpu to arch api.
r? @JohnTitor rustbot has assigned @JohnTitor. Use r? to explicitly pick a reviewer |
cba5173
to
e721608
Compare
e721608
to
51100ae
Compare
51100ae
to
b101560
Compare
This looks great! Could we get it merged? |
b101560
to
36c8345
Compare
That's an unexpected error from the merge queue. |
f144cb7
to
9058e77
Compare
Woops, I think this got stuck again. Could we try to merge it again @JohnTitor @devnexen ? |
9058e77
to
1a8e6f4
Compare
Hello again, this is ready to go! Let me know if I can help in some way? |
@@ -92,5 +92,10 @@ cfg_if! { | |||
|
|||
// static_assert_eq!(core::mem::size_of::<__uint128_t>(), _SIZE_128); | |||
// static_assert_eq!(core::mem::align_of::<__uint128_t>(), _ALIGN_128); | |||
} else if #[cfg(all(target_arch = "aarch64", any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "watchos")))] { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Prefer using target_vendor = "apple"
instead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I ve tried already in the past and now I try again I get this
error: `cfg(target_vendor)` is experimental and subject to change (see issue #29718)
--> ../src/fixed_width_ints.rs:95:50
|
95 | } else if #[cfg(all(target_arch = "aarch64", target_vendor = "apple"))] {
| ^^^^^^^^^^^^^^^^^^^^^^^
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Which job does this fail on? It looks like this should have been stable since 1.33 rust-lang/rust#57465
CI is now failing on FreeBSD 15 |
1a8e6f4
to
eeeea01
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A couple other small changes, plus https://github.com/rust-lang/libc/pull/3578/files#r1703994194 if it works. Then I think we can merge this with the other CI fixes.
// Removed in FreeBSD 15 | ||
"TDF_CANSWAP" | "TDF_SWAPINREQ" => true, | ||
|
||
// Unaccessible in FreeBSD 15 | ||
"TDI_SWAPPED" | "P_SWAPPINGOUT" | "P_SWAPPINGIN" => true, | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you mind moving the freebsd-specific changes to a separate commit so cherry picking is a bit easier?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you mean another PR ? usually we merge squashed commits ultimately.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, just separate commits. Usually only messy history needs to get squashed (e.g. squash the docs fix), and this specifically won't since it will get merged with other CI fixes.
No worries if it's too much trouble.
(I'm just asking because I don't know what exactly needs to get cherry picked to the 0.2 branch to get that CI working)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be ok in theory, l ll get to it soon-ish
src/fixed_width_ints.rs
Outdated
/// C __int128_t (alternate name for [__int128][]) | ||
pub type __int128_t = i128; | ||
/// C __uint128_t (alternate name for [__uint128][]) | ||
pub type __uint128_t = u128; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
__int128
and __uint128
aren't defined in this branch of the cfg.
/// C __int128_t (alternate name for [__int128][]) | |
pub type __int128_t = i128; | |
/// C __uint128_t (alternate name for [__uint128][]) | |
pub type __uint128_t = u128; | |
/// C `__int128_t` | |
pub type __int128_t = i128; | |
/// C `__uint128_t` | |
pub type __uint128_t = u128; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sure
- CI only for macOs arm64. - Fixing build issues for macOs arm64. - Adding macos cpu to arch api.
eeeea01
to
fa686c1
Compare
This was merged via #3797. |
Thank you! |