From f5929037cc38aeb6f32b6b95586a2691554d1636 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Thu, 27 Apr 2017 11:51:02 +0200 Subject: [PATCH] rustbuild: build cargo and rls as part of extended build Build them directly in the `./x.py build` phase, don't wait for `./x.py dist` Signed-off-by: Marc-Antoine Perennou --- src/bootstrap/step.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs index d811e1122c4..35e1b9c6776 100644 --- a/src/bootstrap/step.rs +++ b/src/bootstrap/step.rs @@ -575,6 +575,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules { .dep(|s| s.name("libstd-tool")) .run(move |s| compile::tool(build, s.stage, s.target, "qemu-test-client")); rules.build("tool-cargo", "cargo") + .default(build.config.extended) .dep(|s| s.name("maybe-clean-tools")) .dep(|s| s.name("libstd-tool")) .dep(|s| s.stage(0).host(s.target).name("openssl")) @@ -588,6 +589,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules { .run(move |s| compile::tool(build, s.stage, s.target, "cargo")); rules.build("tool-rls", "rls") .host(true) + .default(build.config.extended) .dep(|s| s.name("librustc-tool")) .dep(|s| s.stage(0).host(s.target).name("openssl")) .dep(move |s| {