Skip to content

Consolidate stage directories and group logs in bootstrap #145295

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Aug 13, 2025
Merged

Consolidate stage directories and group logs in bootstrap #145295

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a279ba4
Consolidate stageN directories in the build directory
Kobzol Aug 5, 2025
fbfcfa6
Unify all groups in bootstrap to use `Builder::msg`
Kobzol Aug 12, 2025
df2da84
Change format of messages in `Builder::fmt`
Kobzol Aug 12, 2025
f7defc0
Resolve review remarks
Kobzol Aug 12, 2025
72b606d
Replace `stage0-tools-bin` with `stage1-tools-bin`
Kobzol Aug 12, 2025
4360c52
Add change tracker entry
Kobzol Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/bootstrap/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,11 +1130,12 @@ impl Build {
let action = action.into().description();
let msg = |fmt| format!("{action} stage{actual_stage} {what}{fmt}");
let msg = if let Some(target) = target.into() {
let build_stage = host_and_stage.stage;
let host = host_and_stage.host;
if host == target {
msg(format_args!(" ({target})"))
msg(format_args!(" (stage{build_stage} -> stage{actual_stage}, {target})"))
} else {
msg(format_args!(" ({host} -> {target})"))
msg(format_args!(" (stage{build_stage}:{host} -> stage{actual_stage}:{target})"))
}
} else {
msg(format_args!(""))
Expand Down
Loading