diff options
| author | bors <bors@rust-lang.org> | 2022-05-02 11:22:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-02 11:22:29 +0000 |
| commit | 542898328637b31412d91b882ce0dc4b85ad54e6 (patch) | |
| tree | 33f6811fcc277be1c813c60d20551692fcec041c | |
| parent | 6b6c1ffacc5df738b3560369746d87499adbeae1 (diff) | |
| parent | 02d41b8f0da25c89b44acb64b354fa406c3417ee (diff) | |
| download | rust-542898328637b31412d91b882ce0dc4b85ad54e6.tar.gz rust-542898328637b31412d91b882ce0dc4b85ad54e6.zip | |
Auto merge of #96310 - bertptrs:remove-debugger-bootstrap, r=Mark-Simulacrum
Remove DebbugerScripts from bootstrap CLI This PR implements #95992 and removes the debugger scripts from the bootstrap CLI. I could not find a lot of documentation on the bootstrap binary so perhaps there's still some documentation to be updated.
| -rw-r--r-- | src/bootstrap/builder.rs | 1 | ||||
| -rw-r--r-- | src/bootstrap/dist.rs | 11 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index dd45bd3a213..edfe31319e8 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -614,7 +614,6 @@ impl<'a> Builder<'a> { dist::RustcDocs, dist::Mingw, dist::Rustc, - dist::DebuggerScripts, dist::Std, dist::RustcDev, dist::Analysis, diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 5d812e8b332..d37a59426f8 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -456,16 +456,7 @@ impl Step for DebuggerScripts { type Output = (); fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { - run.path("src/etc/lldb_batchmode.py") - } - - fn make_run(run: RunConfig<'_>) { - run.builder.ensure(DebuggerScripts { - sysroot: run - .builder - .sysroot(run.builder.compiler(run.builder.top_stage, run.build_triple())), - host: run.target, - }); + run.never() } /// Copies debugger scripts for `target` into the `sysroot` specified. |