Skip to content

Offload cmake cleanups - #162196

Merged
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
ZuseZ4:offload-cmake-cleanups
Sep 16, 2026
Merged

Offload cmake cleanups#162196
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
ZuseZ4:offload-cmake-cleanups

Conversation

@ZuseZ4

@ZuseZ4 ZuseZ4 commented Sep 2, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

r? kobzol

Split out of #161565, which requires (minor) LLVM changes.
These cleanups are valuable on their own already, and shouldn't be blocked. So let's land it, before it get's stale with all the refactoring going on ^^

Copied the disclaimer: I used an llm to implement the fixes, since I still don't like cmake.
I confirm that on a high-level these are the right fixes as far as I can tell, and I reviewed/refactored it.

@rustbot

rustbot commented Sep 2, 2026

Copy link
Copy Markdown
Collaborator

rustc-dev-guide is developed in its own repository. If possible, consider making this change to rust-lang/rustc-dev-guide instead.

cc @BoxyUwU, @tshepang

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

@rustbot rustbot added A-rustc-dev-guide Area: rustc-dev-guide 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 Sep 2, 2026
@rustbot

rustbot commented Sep 2, 2026

Copy link
Copy Markdown
Collaborator

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@ZuseZ4
ZuseZ4 force-pushed the offload-cmake-cleanups branch from 9d399d1 to 341d294 Compare September 2, 2026 15:36
Kobzol
Kobzol reviewed Sep 2, 2026
View reviewed changes

@Kobzol Kobzol left a comment •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't understand the offload specific parts much, but left some bootstrap general remarks.

View changes since this review

Comment thread src/bootstrap/src/core/builder/mod.rs Outdated
Comment thread src/bootstrap/src/core/build_steps/dist.rs Outdated
Comment thread src/bootstrap/src/core/build_steps/llvm.rs Outdated
@Kobzol

Kobzol commented Sep 7, 2026

Copy link
Copy Markdown
Member

@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 Sep 7, 2026
@ZuseZ4
ZuseZ4 force-pushed the offload-cmake-cleanups branch from 341d294 to 808b60c Compare September 15, 2026 18:42
@rustbot

rustbot commented Sep 15, 2026

Copy link
Copy Markdown
Collaborator

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.

Sign in to view
@ZuseZ4 ZuseZ4 mentioned this pull request Sep 15, 2026
Open
5 tasks
@ZuseZ4
Stop building unused libompdevice code
2c9ec83
@ZuseZ4
Remove LLVM_CONFIG_REAL variables
d5a0a16 
Originally introduced in the Enzyme build and coppied around since,
but without effect for a few years by now.
@ZuseZ4
ZuseZ4 force-pushed the offload-cmake-cleanups branch from 808b60c to d5a0a16 Compare September 15, 2026 20:57
@Kobzol

Kobzol commented Sep 16, 2026

Copy link
Copy Markdown
Member

Thanks, looks good from the bootstrap side now.

@bors try jobs=dist-x86_64-linux

You can r=me if the job returns green (also you can check the built artifacts, if you want).

@rust-bors

This comment has been minimized.

Sign in to view
rust-bors Bot pushed a commit that referenced this pull request Sep 16, 2026
@bors
Auto merge of #162196 - ZuseZ4:offload-cmake-cleanups, r=<try>
6d757ef 
Offload cmake cleanups


try-job: dist-x86_64-linux
@rust-bors

rust-bors Bot commented Sep 16, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 6d757ef (6d757ef41fa5b9a16321d46b46010b9a8c5e2ba2)
Base parent: 28e8a8c (28e8a8c81bf3b37909edac6c2a76e56f30cd492f)

@ZuseZ4

ZuseZ4 commented Sep 16, 2026

Copy link
Copy Markdown
Member Author

@bors r=Kobzol rollup

@rust-bors

rust-bors Bot commented Sep 16, 2026

Copy link
Copy Markdown
Contributor

📌 Commit d5a0a16 has been approved by Kobzol

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 16, 2026
@Zalathar Zalathar mentioned this pull request Sep 16, 2026
Merged
rust-bors Bot pushed a commit that referenced this pull request Sep 16, 2026
@bors
Auto merge of #162853 - Zalathar:rollup-7nlu8K9, r=Zalathar
92801ed 
Rollup of 10 pull requests

Successful merges:

 - #156216 (implement const Iterator for Range)
 - #160697 (rustc: Tweak the effect of `--jobs` on frontend parallelism)
 - #162748 (Enable LLVM Thin LTO for LoongArch64)
 - #162769 (Yeet the `DeepRegionResolver` (earlier called `OpportunisticRegionResolver`))
 - #162794 (Simplify `ast::UseTreeKind`)
 - #162800 (Cleanups related to RefDecodable)
 - #162826 (wasm: fix ABI for enums with integer layout and ZST fields)
 - #159359 ([rustc_public] Enhance PassMode API)
 - #162196 (Offload cmake cleanups)
 - #162818 (Add regression test for malformed RPITIT bound ICE with the new solver)
@rust-bors
rust-bors Bot merged commit 9fbeaa4 into rust-lang:main Sep 16, 2026
14 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Sep 16, 2026
rust-bors Bot pushed a commit that referenced this pull request Sep 16, 2026
@bors
Unrolled build for #162196 in rollup 162853
55279b9 
Rollup merge of #162196 - ZuseZ4:offload-cmake-cleanups, r=Kobzol

Offload cmake cleanups

r? kobzol

Split out of #161565, which requires (minor) LLVM changes.
These cleanups are valuable on their own already, and shouldn't be blocked. So let's land it, before it get's stale with all the refactoring going on ^^

Copied the disclaimer: I used an llm to implement the fixes, since I still don't like cmake.
I confirm that on a high-level these are the right fixes as far as I can tell, and I reviewed/refactored it.
pull Bot pushed a commit to LeeeeeeM/miri that referenced this pull request Sep 17, 2026
@bors
Auto merge of #162853 - Zalathar:rollup-7nlu8K9, r=Zalathar
390e0f9 
Rollup of 10 pull requests

Successful merges:

 - rust-lang/rust#156216 (implement const Iterator for Range)
 - rust-lang/rust#160697 (rustc: Tweak the effect of `--jobs` on frontend parallelism)
 - rust-lang/rust#162748 (Enable LLVM Thin LTO for LoongArch64)
 - rust-lang/rust#162769 (Yeet the `DeepRegionResolver` (earlier called `OpportunisticRegionResolver`))
 - rust-lang/rust#162794 (Simplify `ast::UseTreeKind`)
 - rust-lang/rust#162800 (Cleanups related to RefDecodable)
 - rust-lang/rust#162826 (wasm: fix ABI for enums with integer layout and ZST fields)
 - rust-lang/rust#159359 ([rustc_public] Enhance PassMode API)
 - rust-lang/rust#162196 (Offload cmake cleanups)
 - rust-lang/rust#162818 (Add regression test for malformed RPITIT bound ICE with the new solver)
pull Bot pushed a commit to asukaminato0721/rust-clippy that referenced this pull request Sep 17, 2026
@bors
Auto merge of #162853 - Zalathar:rollup-7nlu8K9, r=Zalathar
2a353a0 
Rollup of 10 pull requests

Successful merges:

 - rust-lang/rust#156216 (implement const Iterator for Range)
 - rust-lang/rust#160697 (rustc: Tweak the effect of `--jobs` on frontend parallelism)
 - rust-lang/rust#162748 (Enable LLVM Thin LTO for LoongArch64)
 - rust-lang/rust#162769 (Yeet the `DeepRegionResolver` (earlier called `OpportunisticRegionResolver`))
 - rust-lang/rust#162794 (Simplify `ast::UseTreeKind`)
 - rust-lang/rust#162800 (Cleanups related to RefDecodable)
 - rust-lang/rust#162826 (wasm: fix ABI for enums with integer layout and ZST fields)
 - rust-lang/rust#159359 ([rustc_public] Enhance PassMode API)
 - rust-lang/rust#162196 (Offload cmake cleanups)
 - rust-lang/rust#162818 (Add regression test for malformed RPITIT bound ICE with the new solver)
github-actions Bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Sep 17, 2026
@bors
Auto merge of #162853 - Zalathar:rollup-7nlu8K9, r=Zalathar
6672c4a 
Rollup of 10 pull requests

Successful merges:

 - rust-lang/rust#156216 (implement const Iterator for Range)
 - rust-lang/rust#160697 (rustc: Tweak the effect of `--jobs` on frontend parallelism)
 - rust-lang/rust#162748 (Enable LLVM Thin LTO for LoongArch64)
 - rust-lang/rust#162769 (Yeet the `DeepRegionResolver` (earlier called `OpportunisticRegionResolver`))
 - rust-lang/rust#162794 (Simplify `ast::UseTreeKind`)
 - rust-lang/rust#162800 (Cleanups related to RefDecodable)
 - rust-lang/rust#162826 (wasm: fix ABI for enums with integer layout and ZST fields)
 - rust-lang/rust#159359 ([rustc_public] Enhance PassMode API)
 - rust-lang/rust#162196 (Offload cmake cleanups)
 - rust-lang/rust#162818 (Add regression test for malformed RPITIT bound ICE with the new solver)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Kobzol Kobzol Kobzol left review comments

Assignees

@Kobzol Kobzol

Labels

A-rustc-dev-guide Area: rustc-dev-guide 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

Milestone

1.100.0

Development

Successfully merging this pull request may close these issues.

4 participants

@ZuseZ4 @rustbot @rust-log-analyzer @Kobzol