bootstrap: Move musl-root fallback out of sanity check #144316

Gelbpunkt · 2025-07-22T17:09:25Z

Previously, the musl root would only be set to the fallback /usr by the sanity check, which isn't ran for the bootstrap tests.

r? @Kobzol

Previously, the musl root would only be set to the fallback /usr by the sanity check, which isn't ran for the bootstrap tests. Signed-off-by: Jens Reidel <[email protected]>

Gelbpunkt · 2025-07-22T17:23:23Z

The CI appears to be very flaky right now :/

Kobzol · 2025-07-22T17:25:37Z

Thanks!

@bors r+ rollup

bors · 2025-07-22T17:25:40Z

📌 Commit a9fd8d0 has been approved by Kobzol

It is now in the queue for this repository.

…=Kobzol bootstrap: Move musl-root fallback out of sanity check Previously, the musl root would only be set to the fallback `/usr` by the sanity check, which isn't ran for the bootstrap tests. r? `@Kobzol`

…=Kobzol bootstrap: Move musl-root fallback out of sanity check Previously, the musl root would only be set to the fallback `/usr` by the sanity check, which isn't ran for the bootstrap tests. r? ``@Kobzol``

…=Kobzol bootstrap: Move musl-root fallback out of sanity check Previously, the musl root would only be set to the fallback `/usr` by the sanity check, which isn't ran for the bootstrap tests. r? ```@Kobzol```

Kobzol · 2025-07-23T07:17:42Z

@bors r-

Kobzol · 2025-07-23T07:18:16Z

Oops, CI found something :) Just a lint, but still has to be fixed.

src/bootstrap/src/lib.rs

matthiaskrgr · 2025-07-23T07:18:40Z

@bors r- #144346 (comment)

Signed-off-by: Jens Reidel <[email protected]>

Gelbpunkt · 2025-07-23T18:01:23Z

@rustbot ready

Kobzol · 2025-07-23T19:06:26Z

@bors r+

bors · 2025-07-23T19:06:29Z

📌 Commit e7441fb has been approved by Kobzol

It is now in the queue for this repository.

…=Kobzol bootstrap: Move musl-root fallback out of sanity check Previously, the musl root would only be set to the fallback `/usr` by the sanity check, which isn't ran for the bootstrap tests. r? `@Kobzol`

Rollup of 16 pull requests Successful merges: - #142569 (Suggest clone in user-write-code instead of inside macro) - #143401 (tests: Don't check for self-printed output in std-backtrace.rs test) - #143424 (clippy fix: rely on autoderef) - #143970 (Update core::mem::copy documentation) - #143979 (Test fixes for Arm64EC Windows) - #144160 (tests: debuginfo: Work around or disable broken tests on powerpc) - #144200 (Tweak output for non-`Clone` values moved into closures) - #144209 (Don't emit two `assume`s in transmutes when one is a subset of the other) - #144225 (Don't special-case llvm.* as nounwind) - #144314 (Hint that choose_pivot returns index in bounds) - #144316 (bootstrap: Move musl-root fallback out of sanity check) - #144364 (Update `dlmalloc` dependency of libstd) - #144368 (resolve: Remove `Scope::CrateRoot`) - #144373 (remove deprecated Error::description in impls) - #144390 (Remove dead code and extend test coverage and diagnostics around it) - #144392 (rustc_public: Remove movability from `RigidTy/AggregateKind::Coroutine`) r? `@ghost` `@rustbot` modify labels: rollup

…=Kobzol bootstrap: Move musl-root fallback out of sanity check Previously, the musl root would only be set to the fallback `/usr` by the sanity check, which isn't ran for the bootstrap tests. r? ``@Kobzol``

Rollup of 17 pull requests Successful merges: - #142569 (Suggest clone in user-write-code instead of inside macro) - #143401 (tests: Don't check for self-printed output in std-backtrace.rs test) - #143424 (clippy fix: rely on autoderef) - #143970 (Update core::mem::copy documentation) - #143979 (Test fixes for Arm64EC Windows) - #144160 (tests: debuginfo: Work around or disable broken tests on powerpc) - #144200 (Tweak output for non-`Clone` values moved into closures) - #144209 (Don't emit two `assume`s in transmutes when one is a subset of the other) - #144225 (Don't special-case llvm.* as nounwind) - #144314 (Hint that choose_pivot returns index in bounds) - #144316 (bootstrap: Move musl-root fallback out of sanity check) - #144340 (UI test suite clarity changes: Rename `tests/ui/SUMMARY.md` and update rustc dev guide on `error-pattern`) - #144364 (Update `dlmalloc` dependency of libstd) - #144368 (resolve: Remove `Scope::CrateRoot`) - #144390 (Remove dead code and extend test coverage and diagnostics around it) - #144392 (rustc_public: Remove movability from `RigidTy/AggregateKind::Coroutine`) - #144424 (Allow setting `release-blog-post` label with rustbot) r? `@ghost` `@rustbot` modify labels: rollup

…=Kobzol bootstrap: Move musl-root fallback out of sanity check Previously, the musl root would only be set to the fallback `/usr` by the sanity check, which isn't ran for the bootstrap tests. r? ```@Kobzol```

…=Kobzol bootstrap: Move musl-root fallback out of sanity check Previously, the musl root would only be set to the fallback `/usr` by the sanity check, which isn't ran for the bootstrap tests. r? ````@Kobzol````

Rollup of 16 pull requests Successful merges: - #142569 (Suggest clone in user-write-code instead of inside macro) - #143401 (tests: Don't check for self-printed output in std-backtrace.rs test) - #143424 (clippy fix: rely on autoderef) - #143970 (Update core::mem::copy documentation) - #143979 (Test fixes for Arm64EC Windows) - #144160 (tests: debuginfo: Work around or disable broken tests on powerpc) - #144200 (Tweak output for non-`Clone` values moved into closures) - #144209 (Don't emit two `assume`s in transmutes when one is a subset of the other) - #144314 (Hint that choose_pivot returns index in bounds) - #144316 (bootstrap: Move musl-root fallback out of sanity check) - #144340 (UI test suite clarity changes: Rename `tests/ui/SUMMARY.md` and update rustc dev guide on `error-pattern`) - #144364 (Update `dlmalloc` dependency of libstd) - #144368 (resolve: Remove `Scope::CrateRoot`) - #144390 (Remove dead code and extend test coverage and diagnostics around it) - #144392 (rustc_public: Remove movability from `RigidTy/AggregateKind::Coroutine`) - #144424 (Allow setting `release-blog-post` label with rustbot) r? `@ghost` `@rustbot` modify labels: rollup

…=Kobzol bootstrap: Move musl-root fallback out of sanity check Previously, the musl root would only be set to the fallback `/usr` by the sanity check, which isn't ran for the bootstrap tests. r? `````@Kobzol`````

Rollup of 14 pull requests Successful merges: - #144316 (bootstrap: Move musl-root fallback out of sanity check) - #144352 (RustWrapper: Suppress getNextNonDebugInfoInstruction) - #144356 (Add `ignore-backends` annotations in failing GCC backend ui tests) - #144359 (add codegen test for variadics) - #144376 (Suggest unwrapping when private method name is available in inner type) - #144379 (test using multiple c-variadic ABIs in the same program) - #144383 (disable cfg.has_reliable_f128 on amdgcn) - #144412 (Small cleanup: Use LocalKey<Cell> methods more) - #144421 (Call `is_parsed_attribute` rather than keeping track of a list of parsed attributes manually) - #144422 (library/windows_targets: Fix macro expansion error in 'link' macro) - #144424 (Allow setting `release-blog-post` label with rustbot) - #144430 (tests: aarch64-outline-atomics: Remove hardcoded target) - #144435 (rustc-dev-guide subtree update) - #144445 (Fix `./x check bootstrap` (again)) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 9 pull requests Successful merges: - #144089 (Rehome 35 `tests/ui/issues/` tests to other subdirectories under `tests/ui/`) - #144171 (pattern_analysis: add option to get a full set of witnesses) - #144201 (Mention type that could be `Clone` but isn't in more cases) - #144316 (bootstrap: Move musl-root fallback out of sanity check) - #144339 (Enable dwarf-mixed-versions-lto.rs test on RISC-V (riscv64)) - #144341 (Enable const-vector.rs test on RISC-V (riscv64)) - #144352 (RustWrapper: Suppress getNextNonDebugInfoInstruction) - #144356 (Add `ignore-backends` annotations in failing GCC backend ui tests) - #144364 (Update `dlmalloc` dependency of libstd) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #144316 - Gelbpunkt:musl-libdir-bootstrap, r=Kobzol bootstrap: Move musl-root fallback out of sanity check Previously, the musl root would only be set to the fallback `/usr` by the sanity check, which isn't ran for the bootstrap tests. r? ``````@Kobzol``````

rustbot assigned Kobzol Jul 22, 2025

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 Jul 22, 2025

Gelbpunkt force-pushed the musl-libdir-bootstrap branch from 6a1b4d8 to 142ab3e Compare July 22, 2025 17:15

bootstrap: Move musl-root fallback out of sanity check

a9fd8d0

Previously, the musl root would only be set to the fallback /usr by the sanity check, which isn't ran for the bootstrap tests. Signed-off-by: Jens Reidel <[email protected]>

Gelbpunkt force-pushed the musl-libdir-bootstrap branch from 142ab3e to a9fd8d0 Compare July 22, 2025 17:19

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 Jul 22, 2025

jhpratt mentioned this pull request Jul 23, 2025

Rollup of 12 pull requests #144343

Closed

jhpratt mentioned this pull request Jul 23, 2025

Rollup of 12 pull requests #144345

Closed

matthiaskrgr mentioned this pull request Jul 23, 2025

Rollup of 11 pull requests #144346

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 23, 2025

matthiaskrgr reviewed Jul 23, 2025

View reviewed changes

src/bootstrap/src/lib.rs Outdated Show resolved Hide resolved

Clippy fixup

e7441fb

Signed-off-by: Jens Reidel <[email protected]>

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 Jul 23, 2025

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 23, 2025

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 23, 2025

fmease mentioned this pull request Jul 24, 2025

Rollup of 16 pull requests #144418

Closed

famfo mentioned this pull request Jul 24, 2025

f128 does not link on (aarch64-unknown)-linux-musl targets #144423

Closed

fmease mentioned this pull request Jul 25, 2025

Rollup of 17 pull requests #144428

Closed

matthiaskrgr mentioned this pull request Jul 25, 2025

Rollup of 16 pull requests #144436

Closed

Kobzol mentioned this pull request Jul 25, 2025

Rollup of 10 pull requests #144437

Closed

GuillaumeGomez mentioned this pull request Jul 25, 2025

Rollup of 14 pull requests #144466

Closed

tgross35 mentioned this pull request Jul 26, 2025

Rollup of 9 pull requests #144488

Merged

bors merged commit b950b67 into rust-lang:master Jul 26, 2025
11 checks passed

rustbot added this to the 1.90.0 milestone Jul 26, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

bootstrap: Move musl-root fallback out of sanity check #144316

bootstrap: Move musl-root fallback out of sanity check #144316

Uh oh!

Gelbpunkt commented Jul 22, 2025

Uh oh!

Gelbpunkt commented Jul 22, 2025

Uh oh!

Kobzol commented Jul 22, 2025

Uh oh!

bors commented Jul 22, 2025

Uh oh!

Kobzol commented Jul 23, 2025

Uh oh!

Kobzol commented Jul 23, 2025

Uh oh!

Uh oh!

matthiaskrgr commented Jul 23, 2025

Uh oh!

Gelbpunkt commented Jul 23, 2025

Uh oh!

Kobzol commented Jul 23, 2025

Uh oh!

bors commented Jul 23, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

bootstrap: Move musl-root fallback out of sanity check #144316

bootstrap: Move musl-root fallback out of sanity check #144316

Uh oh!

Conversation

Gelbpunkt commented Jul 22, 2025

Uh oh!

Gelbpunkt commented Jul 22, 2025

Uh oh!

Kobzol commented Jul 22, 2025

Uh oh!

bors commented Jul 22, 2025

Uh oh!

Kobzol commented Jul 23, 2025

Uh oh!

Kobzol commented Jul 23, 2025

Uh oh!

Uh oh!

matthiaskrgr commented Jul 23, 2025

Uh oh!

Gelbpunkt commented Jul 23, 2025

Uh oh!

Kobzol commented Jul 23, 2025

Uh oh!

bors commented Jul 23, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants