From 99f9f089ea3f44bb346b929855de18a5785aa903 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Tue, 8 Sep 2020 17:38:19 +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 --- src/librustc_llvm/build.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs index c5d5f066f4..c15b3ba236 100644 --- a/src/librustc_llvm/build.rs +++ b/src/librustc_llvm/build.rs @@ -123,6 +123,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