Skip to content

Commit 73b34c7

Browse files
authored
Rollup merge of #151517 - paradoxicalguy:enable-debuginfo-tests-linux, r=Kobzol
Enable reproducible binary builds with debuginfo on Linux Fixes #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 #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.
2 parents 7e19e44 + 1e8ffd9 commit 73b34c7

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

  • tests/run-make/reproducible-build

tests/run-make/reproducible-build/rmake.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,9 @@ fn diff_dir_test(crate_type: CrateType, remap_type: RemapType) {
199199
.arg(format!("--remap-path-prefix={}=/b", base_dir.join("test").display()));
200200
}
201201
RemapType::Cwd { is_empty } => {
202-
// FIXME(Oneirical): Building with crate type set to `bin` AND having -Cdebuginfo=2
203-
// (or `-g`, the shorthand form) enabled will cause reproducibility failures
204-
// for multiple platforms.
205-
// See https://github.com/rust-lang/rust/issues/89911
206202
// FIXME(#129117): Windows rlib + `-Cdebuginfo=2` + `-Z remap-cwd-prefix=.` seems
207203
// to be unreproducible.
208-
if !matches!(crate_type, CrateType::Bin) && !is_windows() {
204+
if !is_windows() {
209205
compiler1.arg("-Cdebuginfo=2");
210206
compiler2.arg("-Cdebuginfo=2");
211207
}

0 commit comments

Comments
 (0)