diff options
| author | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2017-11-15 11:21:21 +0100 |
|---|---|---|
| committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2017-11-16 10:51:23 +0100 |
| commit | 8f91a45e484796998942cfe2d7ae1c9aa24ccee2 (patch) | |
| tree | ef4063f0181d6fe012a179aac3529a47b83c9e76 | |
| parent | 8cd573550353427a8a66b6ddd676cb5731d4620e (diff) | |
| download | rust-8f91a45e484796998942cfe2d7ae1c9aa24ccee2.tar.gz rust-8f91a45e484796998942cfe2d7ae1c9aa24ccee2.zip | |
rustbuild: dist cargo-fmt as part of rustfmt
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
| -rw-r--r-- | src/bootstrap/dist.rs | 5 | ||||
| -rw-r--r-- | src/bootstrap/tool.rs | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 7bf385301fa..9009be247a6 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1163,7 +1163,12 @@ impl Step for Rustfmt { compiler: builder.compiler(stage, build.build), target }).expect("Rustfmt to build: toolstate is testing"); + let cargofmt = builder.ensure(tool::Cargofmt { + compiler: builder.compiler(stage, build.build), + target + }).expect("Rustfmt to build: toolstate is testing"); install(&rustfmt, &image.join("bin"), 0o755); + install(&cargofmt, &image.join("bin"), 0o755); let doc = image.join("share/doc/rustfmt"); install(&src.join("README.md"), &doc, 0o644); install(&src.join("LICENSE-MIT"), &doc, 0o644); diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index eb403f88cb0..bc7ec93ca8a 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -451,6 +451,7 @@ macro_rules! tool_extended { } tool_extended!((self, builder), + Cargofmt, rustfmt, "src/tools/rustfmt", "cargo-fmt", {}; Clippy, clippy, "src/tools/clippy", "clippy-driver", { // Clippy depends on procedural macros (serde), which requires a full host // compiler to be available, so we need to depend on that. |