Skip to content

revert: refactor: move sysroot lookup to GlobalContext - #17401

Merged
epage merged 3 commits into
rust-lang:masterfrom
adamgemmell:dev/adagem01/gctx-sysroot-revert
Aug 27, 2026
Merged

revert: refactor: move sysroot lookup to GlobalContext#17401
epage merged 3 commits into
rust-lang:masterfrom
adamgemmell:dev/adagem01/gctx-sysroot-revert

Conversation

@adamgemmell

Copy link
Copy Markdown
Contributor

What does this PR try to resolve?

This PR fixes #17351 by reverting the offending #17276. It should be backported to beta.

We tried to address the issues in #17393 but found that the situation was more complex than we thought, and I'll go another route to make the changes I need.

This PR did not revert cleanly, and there were merge conflicts in the 2nd commit in trim_paths.rs.

How to test and review this PR?

Compare with the reverted PR.

@rustbot

rustbot commented Aug 27, 2026

Copy link
Copy Markdown
Collaborator

r? @epage

rustbot has assigned @epage.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @epage, @weihanglo
  • @epage, @weihanglo expanded to epage, weihanglo
  • Random selection from epage, weihanglo

@rustbot rustbot added A-cache-messages Area: caching of compiler messages A-cfg-expr Area: Platform cfg expressions A-configuration Area: cargo config files and env vars A-layout Area: target output directory layout, naming, and organization Command-fix S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 27, 2026
@epage
epage added this pull request to the merge queue Aug 27, 2026
@weihanglo

Copy link
Copy Markdown
Member

The PR was added in 1.99 already, so

@rustbot label beta-nominated

@rustbot rustbot added the beta-nominated Nominated to backport to the beta branch. label Aug 27, 2026
Merged via the queue into rust-lang:master with commit f391369 Aug 27, 2026
29 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 27, 2026
epage added a commit that referenced this pull request Aug 28, 2026
Beta backports

- #17366
- #17401

In order to make CI pass, the following PRs are also cherry-picked:

- #17378
- #17385
- #17394
- 1d0bb37 to use MSRV-compat API
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-cache-messages Area: caching of compiler messages A-cfg-expr Area: Platform cfg expressions A-configuration Area: cargo config files and env vars A-layout Area: target output directory layout, naming, and organization beta-nominated Nominated to backport to the beta branch. Command-fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

--sysroot from rustflags is ignored for proc-macro runtime lib search paths

4 participants