Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
jyn514 opened this issue Apr 12, 2022 · 5 comments
Closed
Assignees
Labels
E-easy Call for participation: Easy difficulty. Experience needed to fix: Not much. Good first issue. E-mentor Call for participation: This issue has a mentor. Use #t-compiler/help on Zulip for discussion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Comments

@jyn514
Copy link
Member

jyn514 commented 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
dist::DebuggerScripts,

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

@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) E-easy Call for participation: Easy difficulty. Experience needed to fix: Not much. Good first issue. E-mentor Call for participation: This issue has a mentor. Use #t-compiler/help on Zulip for discussion. labels Apr 12, 2022
@jyn514
Copy link
Member Author

jyn514 commented Apr 12, 2022

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

@Mark-Simulacrum
Copy link
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.

@bertptrs
Copy link
Contributor

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

bors added a commit to rust-lang-ci/rust that referenced this issue May 2, 2022
…=Mark-Simulacrum

Remove DebbugerScripts from bootstrap CLI

This PR implements rust-lang#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.
@bertptrs
Copy link
Contributor

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

@jyn514
Copy link
Member Author

jyn514 commented May 11, 2022

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

@jyn514 jyn514 closed this as completed May 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
E-easy Call for participation: Easy difficulty. Experience needed to fix: Not much. Good first issue. E-mentor Call for participation: This issue has a mentor. Use #t-compiler/help on Zulip for discussion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

No branches or pull requests

4 participants