Skip to content

Commit 3484964

Browse files
authored
Unrolled build for rust-lang#129243
Rollup merge of rust-lang#129243 - onur-ozkan:stuff, r=Kobzol do not build `cargo-miri` by default on stable channel Skips `cargo-miri` build on `stable` channel just like `miri`. Closes rust-lang#129171 cc ``@RalfJung``
2 parents c8b14ba + 0ce7705 commit 3484964

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

config.example.toml

+1
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@
337337
# "analysis",
338338
# "src",
339339
# "wasm-component-ld",
340+
# "miri", "cargo-miri" # for dev/nightly channels
340341
#]
341342

342343
# Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose, 3 == print environment variables on each rustc invocation

src/bootstrap/src/core/build_steps/tool.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ tool_extended!((self, builder),
10961096
CargoClippy, "src/tools/clippy", "cargo-clippy", stable=true;
10971097
Clippy, "src/tools/clippy", "clippy-driver", stable=true, add_bins_to_sysroot = ["clippy-driver", "cargo-clippy"];
10981098
Miri, "src/tools/miri", "miri", stable=false, add_bins_to_sysroot = ["miri"];
1099-
CargoMiri, "src/tools/miri/cargo-miri", "cargo-miri", stable=true, add_bins_to_sysroot = ["cargo-miri"];
1099+
CargoMiri, "src/tools/miri/cargo-miri", "cargo-miri", stable=false, add_bins_to_sysroot = ["cargo-miri"];
11001100
Rls, "src/tools/rls", "rls", stable=true;
11011101
Rustfmt, "src/tools/rustfmt", "rustfmt", stable=true, add_bins_to_sysroot = ["rustfmt", "cargo-fmt"];
11021102
);

0 commit comments

Comments
 (0)