diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-08-13 05:07:01 +0500 |
|---|---|---|
| committer | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-08-13 05:15:44 +0500 |
| commit | 82cdf1006e235a318a927b58ab0bc53b7f2a611c (patch) | |
| tree | 045a9672840942f87edcac4f720d4e2ef6294dc1 /src/bootstrap | |
| parent | 657196830fd7fdc03eab87b8afa21601faf07975 (diff) | |
| download | rust-82cdf1006e235a318a927b58ab0bc53b7f2a611c.tar.gz rust-82cdf1006e235a318a927b58ab0bc53b7f2a611c.zip | |
Cargotest needs only one rustdoc.exe to exist on Windows
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/tool.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 7ccd527b338..255ded4c3f6 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -277,8 +277,11 @@ impl Step for Rustdoc { let mut cargo = prepare_tool_cargo(builder, build_compiler, target, "rustdoc"); build.run(&mut cargo); + // Cargo adds a number of paths to the dylib search path on windows, which results in + // the wrong rustdoc being executed. To avoid the conflicting rustdocs, we name the "tool" + // rustdoc a different name. let tool_rustdoc = build.cargo_out(build_compiler, Mode::Tool, target) - .join(exe("rustdoc", &target_compiler.host)); + .join(exe("rustdoc-tool-binary", &target_compiler.host)); // don't create a stage0-sysroot/bin directory. if target_compiler.stage > 0 { |