From a70cfd2f5e2efcc41dbab3af5da1cd7b71565542 Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Tue, 29 Mar 2022 12:23:46 +0100 Subject: [PATCH] d-bootstrap-rustflags Gbp-Pq: Name d-bootstrap-rustflags.patch --- src/bootstrap/builder.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index edd5bf1b5..460f482d4 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -993,6 +993,18 @@ impl<'a> Builder<'a> { rustflags.arg("-Zsymbol-mangling-version=legacy"); } + // 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