From: Ximin Luo <infinity0@debian.org>
Date: Sat, 18 May 2019 19:18:25 +0000 (+0100)
Subject: Don't split dwarf debug for a fully-reproducible build
X-Git-Tag: archive/raspbian/1.33.0+dfsg1-2+rpi1^2~21
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=eba73ab6b5adbc168efbb2c90c894281c730d63b;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 d4a3ae273f..cfc7a4a5dd 100644
--- a/src/librustc_llvm/build.rs
+++ b/src/librustc_llvm/build.rs
@@ -127,6 +127,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;