From ff9c5cfd2813aebdfa97057d892b81807d4f2ad8 Mon Sep 17 00:00:00 2001 From: paradoxicalguy Date: Thu, 22 Jan 2026 22:37:29 +0000 Subject: [PATCH 1/2] Enable reproducible binary builds with debuginfo on Linux --- tests/run-make/reproducible-build/rmake.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run-make/reproducible-build/rmake.rs b/tests/run-make/reproducible-build/rmake.rs index 93fc30de07d7..b4796c806a61 100644 --- a/tests/run-make/reproducible-build/rmake.rs +++ b/tests/run-make/reproducible-build/rmake.rs @@ -205,7 +205,7 @@ fn diff_dir_test(crate_type: CrateType, remap_type: RemapType) { // 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"); } From 1e8ffd9ce58ae197e77d819e2be40f6ce0aceef7 Mon Sep 17 00:00:00 2001 From: abhinav srivastav <136164196+paradoxicalguy@users.noreply.github.com> Date: Fri, 23 Jan 2026 13:10:21 +0530 Subject: [PATCH 2/2] Removed comment on reproducibility issue #89911 Removed comment about reproducibility failures with crate type `bin` and `-Cdebuginfo=2` on non windows machines issue #89911 --- tests/run-make/reproducible-build/rmake.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/run-make/reproducible-build/rmake.rs b/tests/run-make/reproducible-build/rmake.rs index b4796c806a61..993c2c8092a6 100644 --- a/tests/run-make/reproducible-build/rmake.rs +++ b/tests/run-make/reproducible-build/rmake.rs @@ -199,10 +199,6 @@ 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 !is_windows() {