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

Tweak the #[cfg()] statements in sys/ioctl/linux a little #2104

Merged
merged 2 commits into from
Aug 26, 2023

Conversation

asomers
Copy link
Member

@asomers asomers commented Aug 26, 2023

This should give Nix a better chance of building on architectures that aren't specifically-supported.

Supersedes #2096

@asomers
Copy link
Member Author

asomers commented Aug 26, 2023

cc @Dirreke

This should give Nix a better chance of building on architectures that
aren't specifically-supported.
@Dirreke
Copy link

Dirreke commented Aug 26, 2023

Extremely appreciative of it!

Because cross now requires that through a transitive dependency.  I
don't know how to install cross for CI with a lower Rust version.
@asomers asomers force-pushed the cfg-if-ioctl branch 2 times, most recently from 0994441 to bf4d616 Compare August 26, 2023 16:48
@asomers asomers added this pull request to the merge queue Aug 26, 2023
Merged via the queue into nix-rust:master with commit 0e0e181 Aug 26, 2023
35 checks passed
@Dirreke
Copy link

Dirreke commented Sep 13, 2023

Could we merge it in r0.26

Dirreke pushed a commit to Dirreke/nix that referenced this pull request Sep 16, 2023
)

* Tweak the #[cfg()] statements in sys/ioctl/linux a little

This should give Nix a better chance of building on architectures that
aren't specifically-supported.

* Raise MSRV to 1.65.0

Because cross now requires that through a transitive dependency.  I
don't know how to install cross for CI with a lower Rust version.
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.

2 participants