bootstrap: fully rely on RUSTC_WRAPPER#127682
Closed
RalfJung wants to merge 4 commits intorust-lang:masterfrom
Closed
bootstrap: fully rely on RUSTC_WRAPPER#127682RalfJung wants to merge 4 commits intorust-lang:masterfrom
RalfJung wants to merge 4 commits intorust-lang:masterfrom
Conversation
Collaborator
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
Member
Author
|
Turns out even our own libc crate doesn't properly wrap its rustc invocations.^^ I guess I did not hit this locally as the build script was already cached. |
Member
|
@rustbot blocked |
rustbot
added
S-blocked
This comment was marked as outdated.
This comment was marked as outdated.
RalfJung
force-pushed
the
bootstrap-rustc-wrapper
branch
from
ad9308c to
946ee4f
Compare
Member
Author
|
Locally a check-build passes now, let's see what CI says... |
This comment has been minimized.
This comment has been minimized.
Member
Author
|
I guess I still had cached build script results somewhere. The next offender is: field-offset. It uses |
Collaborator
|
These commits modify the If this was unintentional then you should revert the changes before this PR is merged. |
This comment has been minimized.
This comment has been minimized.
Collaborator
|
Some changes occurred in compiler/rustc_codegen_gcc Some changes occurred in compiler/rustc_codegen_cranelift cc @bjorn3 |
This comment has been minimized.
This comment has been minimized.
RalfJung
force-pushed
the
bootstrap-rustc-wrapper
branch
from
d4462b4 to
77d269a
Compare
Collaborator
|
rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead. cc @rust-lang/rust-analyzer |
This comment has been minimized.
This comment has been minimized.
Member
Author
|
Blocked on stepancheg/rust-protobuf#735. |
Member
Author
|
@rust-lang/rust-analyzer not sure if you have some sort of direction relationship with your dependencies, but if you, do, it'd be good if you could take a look at this. I am trying to do a cleanup in bootstrap, and the very last holdout (well, it seems to be the last holdout, it's tricky to be sure) is a problem with one indirect dependency of rust-analyzer: the |
Contributor
|
@RalfJung Ah, I might be able to make a few things happen. Lemme ask around. |
Member
|
|
Member
Author
|
That should be fine though since it's a semver-compatible update. |
Member
Author
|
Oh wtf they use a |
Member
|
|
Member
Author
|
It's not a breaking change to do a semver-compatible update of public API types, is it? Next blocker: sourcegraph/scip#284 |
RalfJung
force-pushed
the
bootstrap-rustc-wrapper
branch
from
77d269a to
4b05169
Compare
This comment has been minimized.
This comment has been minimized.
Member
Author
|
scip got updated, now we're just waiting for rust-lang/rust-analyzer#18315 to be synced into the rustc repo. :) |
Member
|
Once we deal with the fallout from #123951 :-). |
Member
|
Ready. |
RalfJung
force-pushed
the
bootstrap-rustc-wrapper
branch
from
4b05169 to
024677f
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Member
Author
|
What the heck is going on here? Now rustc is triple-wrapped?^^ Seems to be some problem with the clippy logic? Cc @rust-lang/clippy |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Member
Author
|
Hm, compiletest seems to require a single rustc binary, it doesn't support wrappers. This rabbit hole is too deep, I have to stop here. |
Member
|
Clippy uses |
Member
Author
|
I resolved the clippy issue, it's compiletest that stumped me.
|
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
7 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.
With rust-lang/cargo#13659, cargo now respects RUSTC_WRAPPER for all rustc invocations. That means we can finally remove the hack where we set our wrapper as both RUSTC and RUSTC_WRAPPER.
There could still be build scripts that fail to respect RUSTC_WRAPPER, but then we should fix those before they become a rustc dependency.
Fixes #128383