diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-07-21 15:19:39 -0600 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2018-07-21 15:19:39 -0600 |
| commit | ab0092e0d4d704db70d985ffc205db04f80c2e02 (patch) | |
| tree | 78d2cfb4682d6489174937705d42a80b4ba0bd2f /src/bootstrap | |
| parent | 942b384d61590c39eb635596de0370a823001817 (diff) | |
| download | rust-ab0092e0d4d704db70d985ffc205db04f80c2e02.tar.gz rust-ab0092e0d4d704db70d985ffc205db04f80c2e02.zip | |
Run the error index tool against the sysroot libdir
Previously when building the error index tool in stage 0 we would attempt to use stage 0 libraries, but because it depends on rustdoc, those don't exist: rustdoc is built against stage 1 libraries. This patch aligns those two and passes the stage 1 libdir to the error index.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/tool.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 42c65b750d3..0969e5abe07 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -275,7 +275,7 @@ pub fn prepare_tool_cargo( macro_rules! tool { ($($name:ident, $path:expr, $tool_name:expr, $mode:expr $(,llvm_tools = $llvm:expr)*;)+) => { - #[derive(Copy, Clone)] + #[derive(Copy, PartialEq, Eq, Clone)] pub enum Tool { $( $name, @@ -640,7 +640,7 @@ impl<'a> Builder<'a> { fn prepare_tool_cmd(&self, compiler: Compiler, tool: Tool, cmd: &mut Command) { let host = &compiler.host; let mut lib_paths: Vec<PathBuf> = vec![ - if compiler.stage == 0 { + if compiler.stage == 0 && tool != Tool::ErrorIndex { self.build.rustc_snapshot_libdir() } else { PathBuf::from(&self.sysroot_libdir(compiler, compiler.host)) |