diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-12-23 01:17:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-23 01:17:52 +0100 |
| commit | fa1e34fbaf5a21d6ddc677c280ff8510b471bb96 (patch) | |
| tree | 4cbd9a5fb5c227eec30174ce198c4592cd8bf80d | |
| parent | bbde21303a4cf07610df10d4ad938133c9754498 (diff) | |
| parent | 103816d704133fc954344d551af04cb333b03e94 (diff) | |
| download | rust-fa1e34fbaf5a21d6ddc677c280ff8510b471bb96.tar.gz rust-fa1e34fbaf5a21d6ddc677c280ff8510b471bb96.zip | |
Rollup merge of #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`
| -rw-r--r-- | src/bootstrap/setup.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bootstrap/setup.rs b/src/bootstrap/setup.rs index 57426ce3d51..cd360cbef96 100644 --- a/src/bootstrap/setup.rs +++ b/src/bootstrap/setup.rs @@ -96,6 +96,10 @@ impl Step for Profile { } fn make_run(run: RunConfig<'_>) { + if run.builder.config.dry_run() { + return; + } + // for Profile, `run.paths` will have 1 and only 1 element // this is because we only accept at most 1 path from user input. // If user calls `x.py setup` without arguments, the interactive TUI |
