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

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
rust-bors Bot pushed a commit to rust-lang/rust that referenced this pull request Sep 2, 2026
Update cargo submodule



26 commits in e8cb624d5701824f46a2ec5873cfd59ee3d2f66c..b2e9d5f9db3fb1c454ab84f10c16508984a266e2
2026-08-22 00:23:45 +0000 to 2026-09-02 14:49:16 +0000
- fix(parser): Resolve theoretical use-after-free (rust-lang/cargo#17428)
- fix(trim-paths)!: remove default scope from release profile (rust-lang/cargo#17424)
- fix(git): Use git's 429 retry, when available (rust-lang/cargo#17422)
- Avoid passing search path (-L) args when they are passed as --extern (rust-lang/cargo#17410)
- chore(deps): update crate-ci/typos action to v1.50.0 (rust-lang/cargo#17417)
- test: Move -Z onto its own line (rust-lang/cargo#17416)
- chore(triagebot): enable `@rustbot merge/delegate` (rust-lang/cargo#17415)
- Micro-optimize two package dir functions (rust-lang/cargo#17413)
- perf: Do not build SBOM if user has not set build.sbom (rust-lang/cargo#17412)
- feat(manifest)!: implement feature-metadata RFC3416 (rust-lang/cargo#15056)
- Cargo profiling improvements (rust-lang/cargo#17411)
- test(git): Remove gix override run in CI and the mode in code (rust-lang/cargo#17405)
- perf(git): Reduce extra work when using git-cli (rust-lang/cargo#17406)
- feat(resolver): Stabilize min-publish-age (rust-lang/cargo#17335)
- fix(git): Remove ref status update when showing progress  (rust-lang/cargo#17400)
- revert: refactor: move sysroot lookup to GlobalContext (rust-lang/cargo#17401)
- fix(run): Printing a new line to avoid overwriting error code after \r (rust-lang/cargo#17373)
- fix(trim-paths): custom workspace-relative member paths remap (rust-lang/cargo#17366)
- fix(home): rustdoc lint (rust-lang/cargo#17394)
- feat(diag): Stabilize cargo-lints  (rust-lang/cargo#17298)
- chore(deps): Update partial_ref to v0.3.4 (rust-lang/cargo#17392)
- refactor: remove ad-hoc `subslice_range` (rust-lang/cargo#17390)
- docs(changelog): move build-dir new layout to Changed (rust-lang/cargo#17387)
- chore(deps): update msrv (1 version) to v1.98 (rust-lang/cargo#17386)
- docs: Use mdbook admonitions (rust-lang/cargo#17384)
- chore(ci): exclude resolver-tests from intra doc link checks (rust-lang/cargo#17385)
@rustbot rustbot added this to the 1.100.0 milestone Sep 2, 2026
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