Skip to content

Commit ebe4b5f

Browse files
committed
Auto merge of #150283 - Urgau:remap-debuginfo-absolute, r=jieyouxu
Remap both absolute and relative paths when building `rustc` and `std` Turns out [#150110](rust-lang/rust#150110) didn't work as expected, because when the standard library sources are present, we [helpfully un-remap the paths](https://github.com/rust-lang/rust/blob/e951f470d76febcc6f0a5b409c509eb77450a336/compiler/rustc_metadata/src/rmeta/decoder.rs#L1656-L1702) 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 `rustc` and `std`, as well as added a run-make to make sure we don't regress it again (with a new `needs-std-remap-debuginfo` directive). r? `@jieyouxu`
2 parents e449a2f + 78fb3df commit ebe4b5f

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

src/tests/directives.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@ settings:
189189
assertions.
190190
- `needs-std-debug-assertions` — ignores if std was not built with debug
191191
assertions.
192+
- `ignore-std-remap-debuginfo` — ignores if std was built with remapping of
193+
it's sources.
194+
- `needs-std-remap-debugino` — ignores if std was not built with remapping of
195+
it's sources.
192196
- `ignore-rustc-debug-assertions` — ignores if rustc was built with debug
193197
assertions.
194198
- `needs-rustc-debug-assertions` — ignores if rustc was not built with debug

0 commit comments

Comments
 (0)