Skip to content

Commit fa1e34f

Browse files
authored
Rollup merge of rust-lang#106059 - jyn514:setup-twice, r=Nilstrieb
Avoid running the `Profile` step twice on `x setup` Prevents runs like the following: ``` $ x setup Welcome to the Rust project! What do you want to do with x.py? a) library: Contribute to the standard library b) compiler: Contribute to the compiler itself c) codegen: Contribute to the compiler, and also modify LLVM or codegen d) tools: Contribute to tools which depend on the compiler, but do not modify it directly (e.g. rustdoc, clippy, miri) e) user: Install Rust from source Please choose one (a/b/c/d/e): b To get started, try one of the following commands: - `x.py check` - `x.py build` - `x.py test` For more suggestions, see https://rustc-dev-guide.rust-lang.org/building/suggested.html `x.py` will now use the configuration at /home/nilsh/projects/rustfast/src/bootstrap/defaults/config.compiler.toml Welcome to the Rust project! What do you want to do with x.py? ... ``` r? `@Nilstrieb`
2 parents bbde213 + 103816d commit fa1e34f

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/bootstrap/setup.rs

+4
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ impl Step for Profile {
9696
}
9797

9898
fn make_run(run: RunConfig<'_>) {
99+
if run.builder.config.dry_run() {
100+
return;
101+
}
102+
99103
// for Profile, `run.paths` will have 1 and only 1 element
100104
// this is because we only accept at most 1 path from user input.
101105
// If user calls `x.py setup` without arguments, the interactive TUI

0 commit comments

Comments
 (0)