Revert #50105 until regression is fixed #50709
Conversation
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ |
|
📌 Commit 04029f3 has been approved by |
bors
added
S-waiting-on-bors
|
Fair enough. It should be enough to just revert 6d9154a, though (and hopefully leave the fix for my original problem in). The problem seems to be caused by the compiler searching in different directories for system libraries and start files (as with -m32 different start files are supposed to be linked in - and are somewhere to be found on the system, or else building for i686-glibc wouldn't work - but the library search path apparently only contains the start file directory for the x86_64 crt{begin,end}.o files). |
|
@mixi FWIW I don't think this is searching the wrong directories but it can also come up when the files are just missing I believe? |
|
@alexcrichton Of course. I guessed they aren't missing because I assumed (without any reason to - i686-gnu isn't part of the tests) linking for i686-gnu worked on the same system. (Note for future reference: on Ubuntu 14.01, which travis may or may not use, the files are supposed to be in the package |
|
☔ The latest upstream changes (presumably #50615) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
|
@bors: r=sfackler |
|
📌 Commit acc874f has been approved by |
bors
added
S-waiting-on-bors
Revert #50105 until regression is fixed Discovered at #50105 (comment) it looks like this caused a regression with i686 musl, so let's revert in the meantime while a fix is worked out
|
☀️ Test successful - status-appveyor, status-travis |
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
Discovered at #50105 (comment) it looks like this caused a regression with i686 musl, so let's revert in the meantime while a fix is worked out