Merge nix-rust#912

912: Fix compilation on aarch64-unknown-linux-musl r=Susurrus a=Susurrus trust/cross don't support this architecture, so it's non-trivial to add CI testing for this to nix, but this fixed it locally for me. Since it's not a supported platform, I haven't added anything to the CHANGELOG, since this could break before the next release. Co-authored-by: Bryant Mairs <[email protected]>
farnoy · Jun 9, 2018 · 8a9b86e · 8a9b86e
2 parents edea1da + 7f0fb19
commit 8a9b86e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/sys/mman.rs b/src/sys/mman.rs
@@ -48,7 +48,7 @@ libc_bitflags!{
         /// Put the mapping into the first 2GB of the process address space.
         #[cfg(any(all(any(target_os = "android", target_os = "linux"),
                       any(target_arch = "x86", target_arch = "x86_64")),
-                  all(target_os = "linux", target_env = "musl", any(target_arch = "x86", target_pointer_width = "64")),
+                  all(target_os = "linux", target_env = "musl", any(target_arch = "x86", target_arch = "x86_64")),
                   all(target_os = "freebsd", target_pointer_width = "64")))]
         MAP_32BIT;
         /// Used for stacks; indicates to the kernel that the mapping should extend downward in memory.