feat(trim-paths): emit CARGO_TRIM_PATHS_REMAP for build.rs - #17104
Merged
Conversation
Extract the `<from>=<to>` pair computation into `trim_paths_remap` so it can be reused beyond `--remap-path-prefix` flag.
Rename CARGO_TRIM_PATHS to `CARGO_TRIM_PATHS_SCOPE` to make room for a forthcoming `CARGO_TRIM_PATHS_REMAP`.
Build scripts may invoke C/C++ compilers that embed local absolute paths into their output, which `trim-paths` would otherwise miss. This exposes the same `<from>=<to>` remap pairs Cargo passes to rustc as a build script environment variable, so build scripts can forward them like via `-ffile-prefix-map`. Part of rust-lang#12137. See also rust-lang/all-hands-2026#38 (comment)
rustbot
added
A-build-execution
Collaborator
|
r? @ehuss rustbot has assigned @ehuss. Use Why was this reviewer chosen?The reviewer was selected based on:
|
epage
reviewed
Jun 15, 2026
|
|
||
| if let Some(trim_paths) = unit.profile.trim_paths.as_ref() { | ||
| cmd.env("CARGO_TRIM_PATHS", trim_paths.to_string()); | ||
| cmd.env("CARGO_TRIM_PATHS_SCOPE", trim_paths.to_string()); |
Contributor
There was a problem hiding this comment.
I assume build-rs doesn't support this? If it doesn't, I assume we need to make sure its in the task list before stabilization.
18 tasks
epage
approved these changes
Jun 15, 2026
rustbot
removed
the
S-waiting-on-review
rust-bors Bot
pushed a commit
to rust-lang/rust
that referenced
this pull request
Jun 17, 2026
Update cargo submodule 7 commits in fe63976b245b8a649c3f2949bf89fdc307bfbae4..598ab48ec328e3e4f5e4e373d8df7264bc8e27cd 2026-06-11 09:17:57 +0000 to 2026-06-17 02:39:50 +0000 - Improved the test error messages when 'rustc -V' fails (rust-lang/cargo#17108) - test(install): `cargo install` --path honors MSRV (rust-lang/cargo#17102) - feat(trim-paths): emit `CARGO_TRIM_PATHS_REMAP` for build.rs (rust-lang/cargo#17104) - Add funding links (rust-lang/cargo#17103) - fix(diag): Give diagnostics the same display path behavior as rustc (rust-lang/cargo#17101) - refactor: remove cargo-util-terminal from bump-check exclusions (rust-lang/cargo#17098) - fix(diag): Report all errors, in order (rust-lang/cargo#17095)
Member
Author
|
cc-rs PR: rust-lang/cc-rs#1794 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR try to resolve?
Build scripts may invoke C/C++ compilers
that embed local absolute paths into their output,
which
trim-pathswould otherwise miss.This exposes the same
<from>=<to>remap pairs Cargo passes to rustcas a build script environment variable,
so build scripts can forward them like via
-ffile-prefix-map.Part of #12137.
See also
rust-lang/all-hands-2026#38 (comment)
How to test and review this PR?
cc @NobodyXu this might be useful for cc-rs.
cc rust-lang/cc-rs#593