From 643f98f2ac2725ef732843a4f7d7200e9d120aaf Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Thu, 14 Jul 2022 13:17:38 +0200 Subject: [PATCH] d-bootstrap-rustflags Forwarded: not-needed =================================================================== Gbp-Pq: Topic build Gbp-Pq: Name d-bootstrap-rustflags.patch --- src/bootstrap/src/core/builder.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs index e41070cc8f..3e19547975 100644 --- a/src/bootstrap/src/core/builder.rs +++ b/src/bootstrap/src/core/builder.rs @@ -1561,6 +1561,18 @@ impl<'a> Builder<'a> { hostflags.arg("-Zunstable-options"); hostflags.arg("--check-cfg=cfg(bootstrap)"); + // 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. -- 2.30.2