-
Notifications
You must be signed in to change notification settings - Fork 13.3k
ensure compiler existance of tools on the dist step #140006
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
Signed-off-by: onur-ozkan <[email protected]>
r? @clubby789 rustbot has assigned @clubby789. Use |
@@ -421,13 +421,13 @@ impl Step for Rustc { | |||
builder.install(&rustdoc, &image.join("bin"), FileType::Executable); | |||
} | |||
|
|||
let ra_proc_macro_srv_compiler = | |||
builder.compiler_for(compiler.stage, builder.config.build, compiler.host); | |||
builder.ensure(compile::Rustc::new(ra_proc_macro_srv_compiler, compiler.host)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doesn't this now build the compiler for the proc macro server even if tool::RustAnalyzerProcMacroSrv
should not actually be built? 🤔 It's not always enabled.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Compiler is passed before the condition here so I'm not sure how to guard against that without applying ugly hacks. Also, in practice, I don't think we ever hit the case of "trying to build RustAnalyzerProcMacroSrv
while the compiler isn't compiled/ready for use".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, fair enough.
Signed-off-by: onur-ozkan <[email protected]>
@bors try |
1 similar comment
@bors try |
ensure compiler existance of tools on the dist step Fixes rust-lang#138778 with a coverage on rust-lang#138123 and rust-lang#138004. try-job: dist-powerpc64le-linux
⌛ Trying commit 4ba9fff with merge 927bf00b29ad8261c60384c24fcac128268adfcb... |
☀️ Try build successful - checks-actions |
It seems like the exact same bootstrap steps were executed in |
Why do you expect this PR to reduce executed steps? It's not the goal here. |
Yeah. |
I see. Hmm, I don't like this approach though, it's super brittle. The fact that we have to sprinkle these ensure calls sucks. Could we instead move the |
Fixes #138778 with a coverage on #138123 and #138004.
try-job: dist-powerpc64le-linux