From: Ximin Luo <infinity0@debian.org>
Date: Thu, 30 May 2019 04:52:37 +0000 (+0100)
Subject: Don't split dwarf debug for a fully-reproducible build
X-Git-Tag: archive/raspbian/1.34.2+dfsg1-1+rpi1^2~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1d95e4a293bc339dba5784deda819200871260c7;p=rustc.git

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 7fa83dd977..73f292118f 100644
--- a/src/librustc_llvm/build.rs
+++ b/src/librustc_llvm/build.rs
@@ -126,6 +126,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;