mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't build rust-analyzer-proc-macro-srv on def config

Browse source 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
onur-ozkan 2023-12-19 18:09:46 +03:00
parent 9d49eb76c4
commit 57bfbfa897
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/bootstrap/src/core/build_steps/tool.rs
View file

@ -671,11 +671,14 @@ impl Step for RustAnalyzerProcMacroSrv {
// Allow building `rust-analyzer-proc-macro-srv` both as part of the `rust-analyzer` and as a stand-alone tool. // Allow building `rust-analyzer-proc-macro-srv` both as part of the `rust-analyzer` and as a stand-alone tool.
run.path("src/tools/rust-analyzer") run.path("src/tools/rust-analyzer")
.path("src/tools/rust-analyzer/crates/proc-macro-srv-cli") .path("src/tools/rust-analyzer/crates/proc-macro-srv-cli")
.default_condition(builder.config.tools.as_ref().map_or(true, |tools| { .default_condition(
tools builder.config.extended
.iter() && builder.config.tools.as_ref().map_or(true, |tools| {
.any(|tool| tool == "rust-analyzer" || tool == "rust-analyzer-proc-macro-srv") tools.iter().any(|tool| {
})) tool == "rust-analyzer" || tool == "rust-analyzer-proc-macro-srv"
})
}),
)
} }
fn make_run(run: RunConfig<'_>) { fn make_run(run: RunConfig<'_>) {