diff options
| author | Daniil Belov <70999565+BelovDV@users.noreply.github.com> | 2022-09-21 13:59:03 +0300 |
|---|---|---|
| committer | Daniil Belov <70999565+BelovDV@users.noreply.github.com> | 2022-10-26 11:18:14 +0300 |
| commit | 0c4a01af392d3c7b6206ae9726ac481a87ef1cdc (patch) | |
| tree | f1adcfff8951d383e6faba93bdb76a9d2e35473a /src/bootstrap/bin | |
| parent | 5605ed85363345f3def5da6b1ead2ac0b803bfe7 (diff) | |
| download | rust-0c4a01af392d3c7b6206ae9726ac481a87ef1cdc.tar.gz rust-0c4a01af392d3c7b6206ae9726ac481a87ef1cdc.zip | |
check lld version to choose correct flag for tests
Diffstat (limited to 'src/bootstrap/bin')
| -rw-r--r-- | src/bootstrap/bin/rustdoc.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs index e69cab956c5..23828f4758d 100644 --- a/src/bootstrap/bin/rustdoc.rs +++ b/src/bootstrap/bin/rustdoc.rs @@ -55,13 +55,9 @@ fn main() { arg.push(&linker); cmd.arg(arg); } - if env::var_os("RUSTDOC_FUSE_LD_LLD").is_some() { + if let Ok(no_threads) = env::var("RUSTDOC_LLD_NO_THREADS") { cmd.arg("-Clink-arg=-fuse-ld=lld"); - if cfg!(windows) { - cmd.arg("-Clink-arg=-Wl,/threads:1"); - } else { - cmd.arg("-Clink-arg=-Wl,--threads=1"); - } + cmd.arg(format!("-Clink-arg=-Wl,{}", no_threads)); } // Cargo doesn't pass RUSTDOCFLAGS to proc_macros: // https://github.com/rust-lang/cargo/issues/4423 |