diff options
| author | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2019-03-06 18:48:08 +0100 |
|---|---|---|
| committer | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2019-03-06 18:48:08 +0100 |
| commit | f2ef283b7265a35ee4b6e250e1160ba28b33953a (patch) | |
| tree | 8f795e1a0ae56c65ef54774b56cd556dd4fbf7f5 | |
| parent | 8052a4e5ac2c0bd6cf305cd463e105dc462d4792 (diff) | |
| download | rust-f2ef283b7265a35ee4b6e250e1160ba28b33953a.tar.gz rust-f2ef283b7265a35ee4b6e250e1160ba28b33953a.zip | |
Make Cargo a rustc tool again
| -rw-r--r-- | src/bootstrap/test.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/tool.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 6e37bf33452..51412f79c3d 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -213,7 +213,7 @@ impl Step for Cargo { }); let mut cargo = tool::prepare_tool_cargo(builder, compiler, - Mode::ToolStd, + Mode::ToolRustc, self.host, "test", "src/tools/cargo", diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index b12ccc4f39d..9dbcacf7026 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -514,7 +514,7 @@ impl Step for Cargo { compiler: self.compiler, target: self.target, tool: "cargo", - mode: Mode::ToolStd, + mode: Mode::ToolRustc, path: "src/tools/cargo", is_optional_tool: false, source_type: SourceType::Submodule, |