Skip to content
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

linux/musl: Fix multiple definitions of MAP_HUGETLB #3295

Merged
merged 1 commit into from
Jul 9, 2023

Conversation

taiki-e
Copy link
Member

@taiki-e taiki-e commented Jul 9, 2023

Currently, the build for powerpc-unknown-linux-musl is failing due to multiple definitions of MAP_HUGETLB.

$ cargo build -Zbuild-std=core --target powerpc-unknown-linux-musl
   Compiling libc v0.2.147 (...)
error[E0428]: the name `MAP_HUGETLB` is defined multiple times
   --> src/unix/linux_like/linux/musl/b32/powerpc.rs:383:1
    |
257 | pub const MAP_HUGETLB: ::c_int = 0x040000;
    | ------------------------------------------ previous definition of the value `MAP_HUGETLB` here
...
383 | pub const MAP_HUGETLB: ::c_int = 0x040000;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `MAP_HUGETLB` redefined here
    |
    = note: `MAP_HUGETLB` must be defined only once in the value namespace of this module

For more information about this error, try `rustc --explain E0428`.

@rustbot
Copy link
Collaborator

rustbot commented Jul 9, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @JohnTitor (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@JohnTitor
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 9, 2023

📌 Commit cdc0fca has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jul 9, 2023

⌛ Testing commit cdc0fca with merge 2bd687d...

@bors
Copy link
Contributor

bors commented Jul 9, 2023

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 2bd687d to main...

@bors bors merged commit 2bd687d into rust-lang:main Jul 9, 2023
@taiki-e taiki-e deleted the powerpc-linux-musl branch July 9, 2023 11:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants