Fix building rustc on and for musl hosts.#51063
Merged
bors merged 7 commits intorust-lang:masterfrom Jun 2, 2018
Merged
Conversation
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Member
|
@bors: r+ Thanks! |
Collaborator
|
📌 Commit 3407e09 has been approved by |
bors
added
S-waiting-on-bors
Collaborator
|
🔒 Merge conflict |
bors
added
S-waiting-on-author
Collaborator
|
☔ The latest upstream changes (presumably #51138) made this pull request unmergeable. Please resolve the merge conflicts. |
This fixes (only for -crt-static) rust-lang#36710.
Bootstrap requires serde_derive, which needs proc-macro crate types, so it won't work with crt-static.
This still expectedly fails for musl targets with +crt-static.
This is required to use builder.cargo for cargo-vendor.
This makes it go through boostrap/bin/rustc.rs, so it will use -crt-static if needed.
Member
|
@bors r=alexcrichton |
Collaborator
|
📌 Commit a8be9bd has been approved by |
bors
added
S-waiting-on-bors
Collaborator
bors
added a commit
that referenced
this pull request
Jun 2, 2018
Fix building rustc on and for musl hosts. This fixes all problems I had when trying to compile rustc on a musl-based distribution (with `crt-static = false` in `config.toml`). This is a fixed version of what ended up being #50105, making it possible to compile rustc on musl targets. The differences to the old (now merged and subsequently reverted) pull request are: - The commit (6d9154a) that caused the regression for which the original commits were reverted in #50709 is left out. This means the corresponding bug #36710 is still not fixed with `+crt-static`. - The test for issue 36710 is skipped for musl targets (until the issue is properly fixed). - Building cargo-vendor if `crt-static = false` is needed was broken (cargo-vendor links to some shared libraries if they exist on the system and this produces broken binaries with `+crt-static`) CC @alexcrichton
Collaborator
|
☀️ Test successful - status-appveyor, status-travis |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes all problems I had when trying to compile rustc on a musl-based distribution (with
crt-static = falseinconfig.toml).This is a fixed version of what ended up being #50105, making it possible to compile rustc on musl targets.
The differences to the old (now merged and subsequently reverted) pull request are:
+crt-static.crt-static = falseis needed was broken (cargo-vendor links to some shared libraries if they exist on the system and this produces broken binaries with+crt-static)CC @alexcrichton