nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-06 12:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustbuild: Fix test "test rustdoc" invocation

Browse Source 
Previously it would use the librustc output directory which would cause rustdoc
to get entirely recompiled, whereas the intention is that it uses the
already-compiled artifacts from building rustdoc itself, using the tool output
directory
This commit is contained in:
Alex Crichton 2017-09-15 15:28:59 -07:00
parent fd4bef54ab
commit 3da54fb036
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bootstrap/check.rs
View File

@ -1118,10 +1118,11 @@ impl Step for Rustdoc {
let compiler = builder.compiler(builder.top_stage, self.host); let compiler = builder.compiler(builder.top_stage, self.host);
let target = compiler.host; let target = compiler.host;
builder.ensure(RemoteCopyLibs { compiler, target }); let mut cargo = tool::prepare_tool_cargo(builder,
compiler,
let mut cargo = builder.cargo(compiler, Mode::Librustc, target, test_kind.subcommand()); target,
compile::rustc_cargo(build, &compiler, target, &mut cargo); test_kind.subcommand(),
"src/tools/rustdoc");
let _folder = build.fold_output(|| { let _folder = build.fold_output(|| {
format!("{}_stage{}-rustdoc", test_kind.subcommand(), compiler.stage) format!("{}_stage{}-rustdoc", test_kind.subcommand(), compiler.stage)
}); });

8
src/bootstrap/tool.rs
View File

@ -94,20 +94,21 @@ impl Step for ToolBuild {
let _folder = build.fold_output(|| format!("stage{}-{}", compiler.stage, tool)); let _folder = build.fold_output(|| format!("stage{}-{}", compiler.stage, tool));
println!("Building stage{} tool {} ({})", compiler.stage, tool, target); println!("Building stage{} tool {} ({})", compiler.stage, tool, target);
let mut cargo = prepare_tool_cargo(builder, compiler, target, path); let mut cargo = prepare_tool_cargo(builder, compiler, target, "build", path);
build.run(&mut cargo); build.run(&mut cargo);
build.cargo_out(compiler, Mode::Tool, target).join(exe(tool, &compiler.host)) build.cargo_out(compiler, Mode::Tool, target).join(exe(tool, &compiler.host))
} }
} }
fn prepare_tool_cargo( pub fn prepare_tool_cargo(
builder: &Builder, builder: &Builder,
compiler: Compiler, compiler: Compiler,
target: Interned<String>, target: Interned<String>,
command: &'static str,
path: &'static str, path: &'static str,
) -> Command { ) -> Command {
let build = builder.build; let build = builder.build;
let mut cargo = builder.cargo(compiler, Mode::Tool, target, "build"); let mut cargo = builder.cargo(compiler, Mode::Tool, target, command);
let dir = build.src.join(path); let dir = build.src.join(path);
cargo.arg("--manifest-path").arg(dir.join("Cargo.toml")); cargo.arg("--manifest-path").arg(dir.join("Cargo.toml"));
@ -283,6 +284,7 @@ impl Step for Rustdoc {
let mut cargo = prepare_tool_cargo(builder, let mut cargo = prepare_tool_cargo(builder,
build_compiler, build_compiler,
target, target,
"build",
"src/tools/rustdoc"); "src/tools/rustdoc");
build.run(&mut cargo); build.run(&mut cargo);
// Cargo adds a number of paths to the dylib search path on windows, which results in // Cargo adds a number of paths to the dylib search path on windows, which results in