Skip to content

Commit

Permalink
Auto merge of #96310 - bertptrs:remove-debugger-bootstrap, r=Mark-Sim…
Browse files Browse the repository at this point in the history
…ulacrum

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.
  • Loading branch information
bors committed May 2, 2022
2 parents 6b6c1ff + 02d41b8 commit 5428983
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
1 change: 0 additions & 1 deletion src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,6 @@ impl<'a> Builder<'a> {
dist::RustcDocs,
dist::Mingw,
dist::Rustc,
dist::DebuggerScripts,
dist::Std,
dist::RustcDev,
dist::Analysis,
Expand Down
11 changes: 1 addition & 10 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 5428983

Please sign in to comment.