rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Teach rustdoc --test about --sysroot, pass it when testing rust

Browse Source 
This permits rustdoc tests to work in stage0
This commit is contained in:
Aidan Hobson Sayers
2016-12-24 16:04:48 +00:00
parent 17d873c2db
commit babb7daf35
5 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bootstrap/bin/rustdoc.rs
View File

@@ -25,6 +25,7 @@ fn main() {
let rustdoc = env::var_os("RUSTDOC_REAL").expect("RUSTDOC_REAL was not set");
let libdir = env::var_os("RUSTC_LIBDIR").expect("RUSTC_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");
let mut dylib_path = bootstrap::util::dylib_path();
dylib_path.insert(0, PathBuf::from(libdir));
@@ -35,6 +36,8 @@ fn main() {
.arg(format!("stage{}", stage))
.arg("--cfg")
.arg("dox")
.arg("--sysroot")
.arg(sysroot)
.env(bootstrap::util::dylib_path_var(),
env::join_paths(&dylib_path).unwrap());
std::process::exit(match cmd.status() {