Skip to content

Commit 2f482fb

Browse files
committed
lang/rust: Attempt to fix build on armv7
Reported by: mandree,mmel
1 parent 0f41de8 commit 2f482fb

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
gnueabihf was changed to gnu in this commit and it breaks rustix
2+
https://github.com/rust-lang/rust/commit/93ec0e6299e31e6857e8ad741750034f35762b11
3+
4+
5+
--- vendor/rustix-0.38.28/src/backend/libc/fs/syscalls.rs.orig 2024-05-06 16:29:17.182875000 +0200
6+
+++ vendor/rustix-0.38.28/src/backend/libc/fs/syscalls.rs 2024-05-06 16:29:48.897744000 +0200
7+
@@ -140,7 +140,7 @@ pub(crate) fn open(path: &CStr, oflags: OFlags, mode:
8+
pub(crate) fn open(path: &CStr, oflags: OFlags, mode: Mode) -> io::Result<OwnedFd> {
9+
// Work around <https://sourceware.org/bugzilla/show_bug.cgi?id=17523>.
10+
// glibc versions before 2.25 don't handle `O_TMPFILE` correctly.
11+
- #[cfg(all(unix, target_env = "gnu", not(target_os = "hurd")))]
12+
+ #[cfg(all(unix, target_env = "gnu", not(any(target_os = "freebsd", target_os = "hurd"))))]
13+
if oflags.contains(OFlags::TMPFILE) && crate::backend::if_glibc_is_less_than_2_25() {
14+
return open_via_syscall(path, oflags, mode);
15+
}
16+
@@ -203,7 +203,7 @@ pub(crate) fn openat(
17+
) -> io::Result<OwnedFd> {
18+
// Work around <https://sourceware.org/bugzilla/show_bug.cgi?id=17523>.
19+
// glibc versions before 2.25 don't handle `O_TMPFILE` correctly.
20+
- #[cfg(all(unix, target_env = "gnu", not(target_os = "hurd")))]
21+
+ #[cfg(all(unix, target_env = "gnu", not(any(target_os = "freebsd", target_os = "hurd"))))]
22+
if oflags.contains(OFlags::TMPFILE) && crate::backend::if_glibc_is_less_than_2_25() {
23+
return openat_via_syscall(dirfd, path, oflags, mode);
24+
}

0 commit comments

Comments
 (0)