diff options
| author | Frederick Mayle <fmayle@google.com> | 2023-04-01 01:14:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-01 01:14:17 +0000 |
| commit | 2158b39bde06d273be27f09ec17916dfb9abca01 (patch) | |
| tree | 3d2e66dd60d36a1778a2c84ed94a2021e4dbad30 | |
| parent | ecbc9ecccf7ef37fdbf875a2a6ddcf14926c2505 (diff) | |
| parent | 8fbe0a93f72ec36af45ed9ca1be910706b1b36eb (diff) | |
| download | nix-2158b39bde06d273be27f09ec17916dfb9abca01.tar.gz | |
Bypass libc memfd_create when building with glibc am: 11ba04ed31 am: f8663e2827 am: 8fbe0a93f7android14-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/nix/+/2515636
Change-Id: Ideb0b67fe78eeb2394b039be2a71fc2e2698d9f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | patches/memfd.diff | 15 | ||||
| -rw-r--r-- | src/sys/memfd.rs | 4 |
2 files changed, 18 insertions, 1 deletions
diff --git a/patches/memfd.diff b/patches/memfd.diff new file mode 100644 index 0000000..a5d4609 --- /dev/null +++ b/patches/memfd.diff @@ -0,0 +1,15 @@ +diff --git a/src/sys/memfd.rs b/src/sys/memfd.rs +index ad9345e..e43e1e5 100644 +--- a/src/sys/memfd.rs ++++ b/src/sys/memfd.rs +@@ -49,7 +49,9 @@ pub fn memfd_create(name: &CStr, flags: MemFdCreateFlag) -> Result<RawFd> { + any( + target_os = "freebsd", + // If the OS is Linux, gnu and musl expose a memfd_create symbol but not uclibc +- target_env = "gnu", ++ // ++ // ANDROID: Our glibc is too old to have memfd_create. ++ // target_env = "gnu", + target_env = "musl", + )))] + { diff --git a/src/sys/memfd.rs b/src/sys/memfd.rs index ad9345e..e43e1e5 100644 --- a/src/sys/memfd.rs +++ b/src/sys/memfd.rs @@ -49,7 +49,9 @@ pub fn memfd_create(name: &CStr, flags: MemFdCreateFlag) -> Result<RawFd> { any( target_os = "freebsd", // If the OS is Linux, gnu and musl expose a memfd_create symbol but not uclibc - target_env = "gnu", + // + // ANDROID: Our glibc is too old to have memfd_create. + // target_env = "gnu", target_env = "musl", )))] { |