diff options
| author | Andreas Jonson <andjo403@users.noreply.github.com> | 2019-09-01 08:49:26 +0200 |
|---|---|---|
| committer | Andreas Jonson <andjo403@users.noreply.github.com> | 2019-09-01 08:50:23 +0200 |
| commit | f0b30c7ded69123cffe26b54fb1feedf45d1c5a8 (patch) | |
| tree | 12867b40dfd5b5a0a0af1e816859f2be9167fde4 /src/bootstrap/bin | |
| parent | 59cc53e6e708e9b9e86822c1b4d69f28f6c45eae (diff) | |
remove the unstable rustdoc parameter --linker
use the code generation parameter -Clinker (same parameter as rustc) to control what linker to use for building the rustdoc test executables. closes: #63816
Diffstat (limited to 'src/bootstrap/bin')
| -rw-r--r-- | src/bootstrap/bin/rustdoc.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs index 766a3463ecd..a13ff69a7b5 100644 --- a/src/bootstrap/bin/rustdoc.rs +++ b/src/bootstrap/bin/rustdoc.rs @@ -5,6 +5,7 @@ use std::env; use std::process::Command; use std::path::PathBuf; +use std::ffi::OsString; fn main() { let args = env::args_os().skip(1).collect::<Vec<_>>(); @@ -44,7 +45,9 @@ fn main() { cmd.arg("-Z").arg("force-unstable-if-unmarked"); } if let Some(linker) = env::var_os("RUSTC_TARGET_LINKER") { - cmd.arg("--linker").arg(linker).arg("-Z").arg("unstable-options"); + let mut arg = OsString::from("-Clinker="); + arg.push(&linker); + cmd.arg(arg); } // Bootstrap's Cargo-command builder sets this variable to the current Rust version; let's pick |
