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.

Sign up for GitHub

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

Jump to bottom

rust: add musl-libc targets to bootstrapping #109919

Merged
merged 1 commit into from Jan 21, 2021
Merged

rust: add musl-libc targets to bootstrapping #109919

merged 1 commit into from Jan 21, 2021

Conversation

pjjw
Copy link
Contributor

@pjjw pjjw commented Jan 19, 2021

Motivation for this change

presently, when trying to build things with musl-libc that depend on rust, nixpkgs fails to bootstrap the compiler. this adds rust's binary musl bootstrap compilers to the available hashes.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@pjjw pjjw marked this pull request as ready for review January 20, 2021 17:21
@Mic92 Mic92 merged commit 5e0f8f6 into NixOS:master Jan 21, 2021
Mic92
Mic92 reviewed Jan 21, 2021
View reviewed changes
pkgs/development/compilers/rust/1_49.nix
@@ -39,9 +39,11 @@ import ./default.nix {
bootstrapHashes = {
i686-unknown-linux-gnu = "7fdb8836a1f0427d5b47e6a2d496f67ebff04350407411f57cf20c9b3544e26f";
x86_64-unknown-linux-gnu = "950420a35b2dd9091f1b93a9ccd5abc026ca7112e667f246b1deb79204e2038b";
x86_64-unknown-linux-musl = "4ed9627f57b4e0b9807fc5e7513d9731f4791668b7f875b9e44e65e21072c56f";
Copy link
Member

Choose a reason for hiding this comment

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

Last time I checked musl binaries also require musl when doing patchelf. Did this work for you?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@LnL7 LnL7 Awaiting requested review from LnL7

@zowoq zowoq Awaiting requested review from zowoq zowoq is a code owner

Assignees
No one assigned
Labels
6.topic: rust 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@pjjw @Mic92