Skip to content

Drop support for DebuggerTools being invoked from the top-level bootstrap CLI #95992

Closed
Closed
Drop support for DebuggerTools being invoked from the top-level bootstrap CLI#95992
Assignees
bertptrs
Labels
E-easyCall for participation: Easy difficulty. Experience needed to fix: Not much. Good first issue.E-mentorCall for participation: This issue has a mentor. Use #t-compiler/help on Zulip for discussion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Description

@jyn514
jyn514
opened on Apr 12, 2022

@Mark-Simulacrum mentioned we'd also need some work to ensure they're in dist tarballs, but it looks like they're already present:

rust/src/bootstrap/dist.rs

Lines 433 to 435 in 52ca603

// Debugger scripts
builder
.ensure(DebuggerScripts { sysroot: INTERNER.intern_path(image.to_owned()), host });

So I think this is as simple as changing

rust/src/bootstrap/dist.rs

Lines 455 to 459 in 52ca603

impl Step for DebuggerScripts {
type Output = ();
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.path("src/lldb_batchmode.py")
to run.never() and deleting

rust/src/bootstrap/builder.rs

Line 581 in 52ca603

dist::DebuggerScripts,

Originally posted by @Mark-Simulacrum in #95906 (comment)

Activity

  1. rustbot
    added
    T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
    E-easyCall for participation: Easy difficulty. Experience needed to fix: Not much. Good first issue.
    E-mentorCall for participation: This issue has a mentor. Use #t-compiler/help on Zulip for discussion.
    on Apr 12, 2022

  2. jyn514 commented on Apr 12, 2022

    @jyn514
    jyn514
    on Apr 12, 2022
    MemberAuthor

    I double checked and this is never invoked by any scripts in-tree, not even in CI.

  3. Mark-Simulacrum commented on Apr 12, 2022

    @Mark-Simulacrum
    Mark-Simulacrum
    on Apr 12, 2022
    Member

    That sounds right to me -- I think what I meant is that it's possible we should make sure they're present in regular sysroots (i.e., those produced by compile::Assemble like stage1/...), so that tests can pick them up as needed. That's a separate action item here but might be easy enough to bundle in.

  4. bertptrs commented on Apr 21, 2022

    @bertptrs
    bertptrs
    on Apr 21, 2022
    Contributor

    I would like to tackle this as my first issue. @rustbot claim

  5. rustbot
    assigned
    bertptrs
    on Apr 21, 2022
  6. bors
    added a commit that references this issue on May 2, 2022

    Auto merge of rust-lang#96310 - bertptrs:remove-debugger-bootstrap, r…

    5428983

  7. bertptrs commented on May 11, 2022

    @bertptrs
    bertptrs
    on May 11, 2022
    Contributor

    The PR has been merged and I don't think there is anything left to do. Can we close this issue?

  8. jyn514 commented on May 11, 2022

    @jyn514
    jyn514
    on May 11, 2022
    MemberAuthor

    Ah yes :) in the future you can add "Fixes #959922" to your PR description to have it closed automatically.

  9. jyn514
    closed this as completedon May 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

E-easyCall for participation: Easy difficulty. Experience needed to fix: Not much. Good first issue.E-mentorCall for participation: This issue has a mentor. Use #t-compiler/help on Zulip for discussion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Type

No type

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions