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

diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
index 405ce0307cd822f7fff95ddab38f192f12c8eff2..b4b3e83ef6f466dbf4261206fe84c55c0d48d8b3 100644 (file)
--- a/src/librustc_llvm/build.rs
+++ b/src/librustc_llvm/build.rs
@@ -121,6 +121,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;