Remap both absolute and relative paths when building rustc and std
#150283
+145
−5
Conversation
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
Collaborator
|
Some changes occurred in src/tools/compiletest cc @jieyouxu The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes. cc @BoxyUwU, @jieyouxu, @Kobzol, @tshepang The run-make-support library was changed cc @jieyouxu |
rustbot
added
A-compiletest
This comment has been minimized.
This comment has been minimized.
Urgau
force-pushed
the
remap-debuginfo-absolute
branch
from
bd16ded to
4d839da
Compare
Member
Author
|
@bors try jobs=dist-x86_64-linux |
rust-bors bot
added a commit
that referenced
this pull request
Dec 22, 2025
Remap both absolute and relative paths when building `rustc` and `std` try-job: dist-x86_64-linux
|
⌛ Trying commit 4d839da with merge 859f7f2… To cancel the try build, run the command Workflow: https://github.com/rust-lang/rust/actions/runs/20442752661 |
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.
Turns out #150110 didn't work as expected, because when the standard library sources are present, we helpfully un-remap the paths to the local directory of the user, including when we are building the compiler and standard library it-self (duh!), and since those paths are absolute (not relative), our purely relative remapping didn't pick them up.
This behavior wasn't a issue before because the un-remap logic immediately tries to remap them again, and since we had the absolute remapping we would just remap them to the the same thing.
To fix that issue I've adjusted our remapping to remap both the absolute and relative paths when building
rustcandstd, as well as added a run-make to make sure we don't regress it again (with a newneeds-std-remap-debuginfodirective).r? @jieyouxu