-
Notifications
You must be signed in to change notification settings - Fork 13.6k
Do not copy .rmeta files into the sysroot of the build compiler during check #144252
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
base: master
Are you sure you want to change the base?
Conversation
|
The job Click to see the possible cause of the failure (guessed by this bot)
|
nit: s/hcekc/check in the PR title |
I will also need to do this for the Clippy steps. |
Uhh, |
Before, when bootstrap did a check build of rustc stage N (with a build compiler that was stage N-1), it automatically copied the resulting
.rmeta
artifacts into the sysroot of the stage N-1 build compiler, so that stage Nrustc_private
tools such asmiri
could be compiled using the stage N-1 build compiler. This has a number of issues:rustc_private
tools were actually built.check::Std
actually doesn't copy the artifacts anymore (which forces us to build std instead of just checking it in a bunch ofCheck
steps).Based on suggestions by @cuviper and @bjorn3, I tried to change how this behaves. Instead of copying the rmeta artifacts into the sysroot of the build compiler (from where they would be loaded implicitly), they are now stored in a separate transient bootstrap build directory, and they are then explicitly passed only when checking
rustc_private
tools using the-L
flag. The flags are passed out-of-band through our rustc wrapper, to avoid invalidating the build cache.Based on my local tests, this seemed to be working fine. If it works on CI, and we don't run into other issues after merging it, I'd like to do the same also for rlib artifacts generated during
x build
.Based on #143816 (only the last commit is new).
r? @jieyouxu