From 5e651287e9f690928dc485094ecec0589efe3540 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Tue, 29 Mar 2022 12:23:46 +0100 Subject: [PATCH] Don't split dwarf debug for a fully-reproducible build Bug: https://github.com/rust-lang/rust/issues/34902 Gbp-Pq: Name u-reproducible-build.patch --- compiler/rustc_llvm/build.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs index 943ce589c4..9b23f8a870 100644 --- a/compiler/rustc_llvm/build.rs +++ b/compiler/rustc_llvm/build.rs @@ -122,6 +122,11 @@ fn main() { let mut cfg = cc::Build::new(); cfg.warnings(false); for flag in cxxflags.split_whitespace() { + // Split-dwarf gives unreproducible DW_AT_GNU_dwo_id so don't do it + if flag == "-gsplit-dwarf" { + continue; + } + // Ignore flags like `-m64` when we're doing a cross build if is_crossed && flag.starts_with("-m") { continue; -- 2.30.2