Skip to content

Offload: Build offload as a single Step#150108

Merged
bors merged 2 commits intorust-lang:mainfrom
ZuseZ4:offload-build-rework
Dec 29, 2025
Merged

Offload: Build offload as a single Step#150108
bors merged 2 commits intorust-lang:mainfrom
ZuseZ4:offload-build-rework

Conversation

@ZuseZ4
Copy link
Copy Markdown
Member

@ZuseZ4 ZuseZ4 commented Dec 17, 2025

r? @Kobzol

Since it looks like we'll postpone enabling offload in CI for a bit, I factored out these improvements which we want independently. I locally tested both build options successfully, the in-tree-clang build, as well as the build where we provide a path to an external clang.

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Dec 17, 2025

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

This PR modifies bootstrap.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Dec 17, 2025
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Dec 17, 2025

Kobzol is not on the review rotation at the moment.
They may take a while to respond.

@ZuseZ4 ZuseZ4 force-pushed the offload-build-rework branch from 93bc6ea to 4b2d2b9 Compare December 17, 2025 18:32
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Dec 17, 2025

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@rust-log-analyzer

This comment has been minimized.

@ZuseZ4 ZuseZ4 force-pushed the offload-build-rework branch from 4b2d2b9 to dbe2964 Compare December 17, 2025 21:08
Copy link
Copy Markdown
Member

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some comments, otherwise it looks reasonable.

View changes since this review

Comment thread bootstrap.example.toml Outdated
Comment thread src/bootstrap/src/core/config/config.rs Outdated
Comment thread src/bootstrap/src/core/config/toml/llvm.rs Outdated
Comment thread src/bootstrap/src/core/build_steps/llvm.rs Outdated
Comment thread src/bootstrap/src/core/build_steps/llvm.rs Outdated
Comment thread src/bootstrap/src/core/build_steps/llvm.rs Outdated
Comment thread src/bootstrap/src/core/build_steps/llvm.rs Outdated
Comment thread src/bootstrap/src/core/build_steps/llvm.rs Outdated
Comment thread src/bootstrap/src/core/build_steps/compile.rs Outdated
Comment thread src/bootstrap/src/core/build_steps/compile.rs Outdated
@Kobzol Kobzol mentioned this pull request Dec 19, 2025
@Kobzol
Copy link
Copy Markdown
Member

Kobzol commented Dec 19, 2025

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 19, 2025
@ZuseZ4 ZuseZ4 mentioned this pull request Dec 19, 2025
5 tasks
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@ZuseZ4
Copy link
Copy Markdown
Member Author

ZuseZ4 commented Dec 22, 2025

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 22, 2025
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@ZuseZ4 ZuseZ4 force-pushed the offload-build-rework branch from 430334c to d6a7ae6 Compare December 22, 2025 18:42
@ZuseZ4 ZuseZ4 force-pushed the offload-build-rework branch from d6a7ae6 to ac1585f Compare December 22, 2025 19:20
@rust-log-analyzer

This comment has been minimized.

@ZuseZ4 ZuseZ4 force-pushed the offload-build-rework branch from ac1585f to 180c30f Compare December 22, 2025 22:31
@rust-log-analyzer

This comment has been minimized.

@Kobzol
Copy link
Copy Markdown
Member

Kobzol commented Dec 29, 2025

Thanks, looks good!

@bors r+

@bors
Copy link
Copy Markdown
Collaborator

bors commented Dec 29, 2025

📌 Commit f3b16d8 has been approved by Kobzol

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 29, 2025
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Dec 29, 2025
Offload: Build offload as a single Step

r? ``@Kobzol``

Since it looks like we'll postpone enabling offload in CI for a bit, I factored out these improvements which we want independently. I locally tested both build options successfully, the in-tree-clang build, as well as the build where we provide a path to an external clang.
bors added a commit that referenced this pull request Dec 29, 2025
Rollup of 6 pull requests

Successful merges:

 - #150108 (Offload: Build offload as a single Step)
 - #150262 (slice iter cleanup: replace checked_sub with saturating_sub)
 - #150427 (add has_offload/needs-offload to the test infra)
 - #150458 (fix running stdlib doctests in Miri in CI)
 - #150477 (Fix enum variant suggestion consuming trailing parenthesis)
 - #150478 (Fix new bors config)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f67b020 into rust-lang:main Dec 29, 2025
11 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Dec 29, 2025
rust-timer added a commit that referenced this pull request Dec 29, 2025
Rollup merge of #150108 - ZuseZ4:offload-build-rework, r=Kobzol

Offload: Build offload as a single Step

r? `@Kobzol`

Since it looks like we'll postpone enabling offload in CI for a bit, I factored out these improvements which we want independently. I locally tested both build options successfully, the in-tree-clang build, as well as the build where we provide a path to an external clang.
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Jan 2, 2026
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#150108 (Offload: Build offload as a single Step)
 - rust-lang/rust#150262 (slice iter cleanup: replace checked_sub with saturating_sub)
 - rust-lang/rust#150427 (add has_offload/needs-offload to the test infra)
 - rust-lang/rust#150458 (fix running stdlib doctests in Miri in CI)
 - rust-lang/rust#150477 (Fix enum variant suggestion consuming trailing parenthesis)
 - rust-lang/rust#150478 (Fix new bors config)

r? `@ghost`
`@rustbot` modify labels: rollup
@ZuseZ4 ZuseZ4 deleted the offload-build-rework branch January 31, 2026 05:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants