Skip to content

Fix compilation on aarch64-unknown-linux-musl #912

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

Merged
merged 1 commit into from
Jun 9, 2018

Conversation

Susurrus
Copy link
Contributor

@Susurrus Susurrus commented Jun 3, 2018

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.

@asomers
Copy link
Member

asomers commented Jun 3, 2018

Didn't build on FreeBSD due to ENOSPC. If you push again, I think it'll build. Or, you can bypass bors and just press the merge button, just this once.

Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@agend
Copy link

agend commented Jun 8, 2018

Hi Gents, are you planning to merge this? It would be very helpful for us - we are trying to build on aarch64-musl and stuck on this one.

@Susurrus
Copy link
Contributor Author

Susurrus commented Jun 8, 2018

@agend while this fixes nix now, it's likely this will break again in the future. If you really want to get proper support added to nix, please contribute to japaric/cross as we rely on that for our CI testing.

bors r+

bors bot added a commit that referenced this pull request Jun 8, 2018
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]>
@bors
Copy link
Contributor

bors bot commented Jun 8, 2018

Build failed

@Susurrus
Copy link
Contributor Author

Susurrus commented Jun 9, 2018

bors r+

bors bot added a commit that referenced this pull request Jun 9, 2018
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]>
@bors
Copy link
Contributor

bors bot commented Jun 9, 2018

@@ -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")),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Emm, isn't this branch

all(target_os = "linux", target_env = "musl", any(target_arch = "x86", target_arch = "x86_64"))

already covered by

all(any(target_os = "android", target_os = "linux"), any(target_arch = "x86", target_arch = "x86_64"))

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.

4 participants