diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-09-24 07:38:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-24 07:38:56 +0200 |
| commit | 00dfc32cadbf0c971a976273843361d83012497b (patch) | |
| tree | 321cb600c1f2a7109d124257f9a9c0431bf9caa5 | |
| parent | a842357d37b0c043ccfeccc568cbf597d217d887 (diff) | |
| parent | 7ed999b616a7be1014af93760c4f8fc5851eef76 (diff) | |
| download | rust-00dfc32cadbf0c971a976273843361d83012497b.tar.gz rust-00dfc32cadbf0c971a976273843361d83012497b.zip | |
Rollup merge of #102175 - oli-obk:miri_subtree_cleanup, r=jyn514
Also require other subtrees to always build successfully r? ``@jyn514``
| -rw-r--r-- | src/bootstrap/dist.rs | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index b7bc96cc86d..e92c4669a24 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1424,7 +1424,7 @@ impl Step for Extended { let xform = |p: &Path| { let mut contents = t!(fs::read_to_string(p)); - for tool in &["rust-demangler", "rust-analyzer", "rustfmt"] { + for tool in &["rust-demangler"] { if !built_tools.contains(tool) { contents = filter(&contents, tool); } @@ -1465,7 +1465,8 @@ impl Step for Extended { prepare("rust-analysis"); prepare("clippy"); prepare("miri"); - for tool in &["rust-docs", "rust-demangler", "rust-analyzer"] { + prepare("rust-analyzer"); + for tool in &["rust-docs", "rust-demangler"] { if built_tools.contains(tool) { prepare(tool); } @@ -1525,7 +1526,8 @@ impl Step for Extended { prepare("rust-std"); prepare("clippy"); prepare("miri"); - for tool in &["rust-demangler", "rust-analyzer"] { + prepare("rust-analyzer"); + for tool in &["rust-demangler"] { if built_tools.contains(tool) { prepare(tool); } @@ -1609,25 +1611,23 @@ impl Step for Extended { .arg("-out") .arg(exe.join("StdGroup.wxs")), ); - if built_tools.contains("rust-analyzer") { - builder.run( - Command::new(&heat) - .current_dir(&exe) - .arg("dir") - .arg("rust-analyzer") - .args(&heat_flags) - .arg("-cg") - .arg("RustAnalyzerGroup") - .arg("-dr") - .arg("RustAnalyzer") - .arg("-var") - .arg("var.RustAnalyzerDir") - .arg("-out") - .arg(exe.join("RustAnalyzerGroup.wxs")) - .arg("-t") - .arg(etc.join("msi/remove-duplicates.xsl")), - ); - } + builder.run( + Command::new(&heat) + .current_dir(&exe) + .arg("dir") + .arg("rust-analyzer") + .args(&heat_flags) + .arg("-cg") + .arg("RustAnalyzerGroup") + .arg("-dr") + .arg("RustAnalyzer") + .arg("-var") + .arg("var.RustAnalyzerDir") + .arg("-out") + .arg(exe.join("RustAnalyzerGroup.wxs")) + .arg("-t") + .arg(etc.join("msi/remove-duplicates.xsl")), + ); builder.run( Command::new(&heat) .current_dir(&exe) |