Rollup merge of #151517 - paradoxicalguy:enable-debuginfo-tests-linux, r=Kobzol

Enable reproducible binary builds with debuginfo on Linux

Fixes rust-lang/rust#89911

This PR enables `-Cdebuginfo=2` for binary crate types in the `reproducible-build` run-make test on Linux platforms.

- Removed the `!matches!(crate_type, CrateType::Bin)` check in `diff_dir_test()`
- SHA256 hashes match: `932be0d950f4ffae62451f7b4c8391eb458a68583feb11193dd501551b6201d4`

This scenario was previously disabled due to rust-lang/rust#89911. I have verified locally on Linux (WSL) with LLVM 21 that the regression reported in that issue appears to be resolved, and the tests now pass with debug info enabled.
This commit is contained in:
Jonathan Brouwer 2026-01-24 08:18:06 +01:00 committed by GitHub
commit db8b9ecb5c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -199,13 +199,9 @@ fn diff_dir_test(crate_type: CrateType, remap_type: RemapType) {
.arg(format!("--remap-path-prefix={}=/b", base_dir.join("test").display()));
}
RemapType::Cwd { is_empty } => {
// FIXME(Oneirical): Building with crate type set to `bin` AND having -Cdebuginfo=2
// (or `-g`, the shorthand form) enabled will cause reproducibility failures
// for multiple platforms.
// See https://github.com/rust-lang/rust/issues/89911
// FIXME(#129117): Windows rlib + `-Cdebuginfo=2` + `-Z remap-cwd-prefix=.` seems
// to be unreproducible.
if !matches!(crate_type, CrateType::Bin) && !is_windows() {
if !is_windows() {
compiler1.arg("-Cdebuginfo=2");
compiler2.arg("-Cdebuginfo=2");
}