From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Sun, 29 Dec 2019 22:17:04 +0000 (+0000)
Subject: u-reproducible-compiler-builtins
X-Git-Tag: archive/raspbian/1.40.0+dfsg1-1+rpi1^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fb2e25394685d1b0216f30713e81da227af171b5;p=rustc.git

u-reproducible-compiler-builtins


Gbp-Pq: Name u-reproducible-compiler-builtins.patch
---

diff --git a/vendor/compiler_builtins/build.rs b/vendor/compiler_builtins/build.rs
index c714bc15de..490b6391d0 100644
--- a/vendor/compiler_builtins/build.rs
+++ b/vendor/compiler_builtins/build.rs
@@ -423,6 +423,11 @@ mod c {
             panic!("RUST_COMPILER_RT_ROOT={} does not exist", root.display());
         }
 
+        // Support deterministic builds by remapping the __FILE__ prefix if the
+        // compiler supports it.  This fixes the nondeterminism caused by the
+        // use of that macro in lib/builtins/int_util.h in compiler-rt.
+        cfg.flag_if_supported(&format!("-ffile-prefix-map={}=.", root.display()));
+
         let src_dir = root.join("lib/builtins");
         for (sym, src) in sources.map.iter() {
             let src = src_dir.join(src);