Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove --cfg dox from rustdoc.rs #77347

Merged
merged 3 commits into from
Oct 3, 2020
Merged

Remove --cfg dox from rustdoc.rs #77347

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6533c29
Remove --cfg dox from rustdoc.rs
jyn514 Sep 29, 2020
351f850
Remove unused --cfg stageN
jyn514 Sep 29, 2020
ca98778
Update stdarch submodule
jyn514 Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/bootstrap/bin/rustdoc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,10 @@ 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))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, this also looks stale, we should really be passing --cfg bootstrap in stage 0 these days, cfg(stage0) shouldn't be used by anything.

Want to update that in this PR as well? (We should match rustc.rs).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like rustc.rs doesn't set it either, I did find it set in compile.rs though:

compile.rs
422-                        .arg("--cfg")
423:                        .arg("bootstrap")

Maybe nothing actually needs --cfg bootstrap for rustdoc? I'll try removing --cfg stage0 and see.

.arg("--cfg")
.arg("dox")
.arg("--sysroot")
.arg(&sysroot)
.env(bootstrap::util::dylib_path_var(), env::join_paths(&dylib_path).unwrap());
Expand Down