diff options
| author | bors <bors@rust-lang.org> | 2020-10-03 07:23:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-03 07:23:02 +0000 |
| commit | 6f56fbdc1c58992a9db630f5cd2ba9882d32e84b (patch) | |
| tree | e56477ee788fa47c75907c1ec4c28cdb576f8530 /src | |
| parent | 8c54cf67c1bdae93ecef9791dc07c0982bb76041 (diff) | |
| parent | ca987789ea2da972dee6e84e7aa8017840553bf9 (diff) | |
| download | rust-6f56fbdc1c58992a9db630f5cd2ba9882d32e84b.tar.gz rust-6f56fbdc1c58992a9db630f5cd2ba9882d32e84b.zip | |
Auto merge of #77347 - jyn514:dox, r=Amanieu
Remove --cfg dox from rustdoc.rs This was added in https://github.com/rust-lang/rust/pull/53076 because several dependencies were using `cfg(dox)` instead of `cfg(rustdoc)` (now `cfg(doc)`). I ran `rg 'cfg\(dox\)'` on the source tree with no matches, so I think this is now safe to remove. r? `@Mark-Simulacrum` cc `@QuietMisdreavus` :)
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/bin/rustdoc.rs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs index cb58eb89ad8..cba17c8e608 100644 --- a/src/bootstrap/bin/rustdoc.rs +++ b/src/bootstrap/bin/rustdoc.rs @@ -11,7 +11,6 @@ fn main() { let args = env::args_os().skip(1).collect::<Vec<_>>(); let rustdoc = env::var_os("RUSTDOC_REAL").expect("RUSTDOC_REAL was not set"); let libdir = env::var_os("RUSTDOC_LIBDIR").expect("RUSTDOC_LIBDIR was not set"); - let stage = env::var("RUSTC_STAGE").expect("RUSTC_STAGE was not set"); let sysroot = env::var_os("RUSTC_SYSROOT").expect("RUSTC_SYSROOT was not set"); use std::str::FromStr; @@ -24,14 +23,8 @@ fn main() { let mut dylib_path = bootstrap::util::dylib_path(); dylib_path.insert(0, PathBuf::from(libdir.clone())); - //FIXME(misdreavus): once stdsimd uses cfg(doc) instead of cfg(dox), remove the `--cfg dox` - //arguments here let mut cmd = Command::new(rustdoc); cmd.args(&args) - .arg("--cfg") - .arg(format!("stage{}", stage)) - .arg("--cfg") - .arg("dox") .arg("--sysroot") .arg(&sysroot) .env(bootstrap::util::dylib_path_var(), env::join_paths(&dylib_path).unwrap()); |
