diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-06-09 14:53:06 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-06-09 14:53:06 +0000 |
| commit | 8a9b86eae2e14f5aec94f82ec3de6ca59a804f30 (patch) | |
| tree | 8eb194e5f7b6ec967cfd5fd54af9a0fabcf30286 /src | |
| parent | edea1daa834f709033639623a1cdfffd43dd53ff (diff) | |
| parent | 7f0fb19f21327e58faa71dace73c8b092c25c81b (diff) | |
| download | nix-8a9b86eae2e14f5aec94f82ec3de6ca59a804f30.zip | |
Merge #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 <bryantmairs@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sys/mman.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sys/mman.rs b/src/sys/mman.rs index f2cc699b..48b5767e 100644 --- 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. |