diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2024-08-23 12:32:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-23 12:32:14 +0200 |
| commit | e5cd26a22e41e7405332d02e6c181eb6d8bd21f6 (patch) | |
| tree | ab4e1dd13c546cae84f93f93e2ec221d4eceb68d | |
| parent | 440076db48985ad741cbb6c11e2b05a4dec81eca (diff) | |
| parent | 0ce7705356cb5161dc733541f2a8c2312f0addcc (diff) | |
| download | rust-e5cd26a22e41e7405332d02e6c181eb6d8bd21f6.tar.gz rust-e5cd26a22e41e7405332d02e6c181eb6d8bd21f6.zip | |
Rollup merge of #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 #129171 cc ``@RalfJung``
| -rw-r--r-- | config.example.toml | 1 | ||||
| -rw-r--r-- | src/bootstrap/src/core/build_steps/tool.rs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config.example.toml b/config.example.toml index 1b7de662e84..f1dc32234cc 100644 --- a/config.example.toml +++ b/config.example.toml @@ -337,6 +337,7 @@ # "analysis", # "src", # "wasm-component-ld", +# "miri", "cargo-miri" # for dev/nightly channels #] # Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose, 3 == print environment variables on each rustc invocation diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs index ff8ca2ad74a..3a1eb43b801 100644 --- a/src/bootstrap/src/core/build_steps/tool.rs +++ b/src/bootstrap/src/core/build_steps/tool.rs @@ -1096,7 +1096,7 @@ tool_extended!((self, builder), CargoClippy, "src/tools/clippy", "cargo-clippy", stable=true; Clippy, "src/tools/clippy", "clippy-driver", stable=true, add_bins_to_sysroot = ["clippy-driver", "cargo-clippy"]; Miri, "src/tools/miri", "miri", stable=false, add_bins_to_sysroot = ["miri"]; - CargoMiri, "src/tools/miri/cargo-miri", "cargo-miri", stable=true, add_bins_to_sysroot = ["cargo-miri"]; + CargoMiri, "src/tools/miri/cargo-miri", "cargo-miri", stable=false, add_bins_to_sysroot = ["cargo-miri"]; Rls, "src/tools/rls", "rls", stable=true; Rustfmt, "src/tools/rustfmt", "rustfmt", stable=true, add_bins_to_sysroot = ["rustfmt", "cargo-fmt"]; ); |