From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Thu, 14 Jul 2022 11:17:38 +0000 (+0200)
Subject: d-bootstrap-rustflags
X-Git-Tag: archive/raspbian/1.85.0+dfsg2-2+rpi1~6^2^2~27
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b1deca5f44376caa694586750c14466eb086c311;p=rustc.git

d-bootstrap-rustflags

Forwarded: not-needed

===================================================================

Gbp-Pq: Topic build
Gbp-Pq: Name d-bootstrap-rustflags.patch
---

diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs
index a73e6cf41e..55e4cc4cc7 100644
--- a/src/bootstrap/src/core/builder/cargo.rs
+++ b/src/bootstrap/src/core/builder/cargo.rs
@@ -627,6 +627,18 @@ impl Builder<'_> {
         // #[cfg(bootstrap)] as we are transition `test` to userspace cfg
         hostflags.arg("--check-cfg=cfg(test)");
 
+        // Debian-specific stuff here
+        // set linker flags from LDFLAGS
+        if let Ok(ldflags) = env::var("LDFLAGS") {
+            for flag in ldflags.split_whitespace() {
+                if target.contains("windows") && flag.contains("relro") {
+                    // relro is ELF-specific
+                    continue;
+                }
+                rustflags.arg(&format!("-Clink-args={}", flag));
+            }
+        }
+
         // FIXME: It might be better to use the same value for both `RUSTFLAGS` and `RUSTDOCFLAGS`,
         // but this breaks CI. At the very least, stage0 `rustdoc` needs `--cfg bootstrap`. See
         // #71458.