From: bors <bors@rust-lang.org>
Date: Sat, 29 Apr 2017 03:56:09 +0000 (+0000)
Subject: Auto merge of #41577 - Keruspe:master, r=alexcrichton
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=95467d33cb98c8a9be12da15be559e60628180f5;p=rust.git

Auto merge of #41577 - Keruspe:master, r=alexcrichton

rustbuild improvements

Properly hook up cargo and rls in the build phase, and install them, when extended build is enabled.
---

95467d33cb98c8a9be12da15be559e60628180f5
diff --cc src/bootstrap/step.rs
index a4d6f91fbef,ecd8a048786..c15e889394f
--- a/src/bootstrap/step.rs
+++ b/src/bootstrap/step.rs
@@@ -566,15 -566,17 +566,17 @@@ pub fn build_rules<'a>(build: &'a Build
           .dep(|s| s.name("maybe-clean-tools"))
           .dep(|s| s.name("libstd-tool"))
           .run(move |s| compile::tool(build, s.stage, s.target, "build-manifest"));
 -    rules.build("tool-qemu-test-server", "src/tools/qemu-test-server")
 +    rules.build("tool-remote-test-server", "src/tools/remote-test-server")
           .dep(|s| s.name("maybe-clean-tools"))
           .dep(|s| s.name("libstd-tool"))
 -         .run(move |s| compile::tool(build, s.stage, s.target, "qemu-test-server"));
 -    rules.build("tool-qemu-test-client", "src/tools/qemu-test-client")
 +         .run(move |s| compile::tool(build, s.stage, s.target, "remote-test-server"));
 +    rules.build("tool-remote-test-client", "src/tools/remote-test-client")
           .dep(|s| s.name("maybe-clean-tools"))
           .dep(|s| s.name("libstd-tool"))
 -         .run(move |s| compile::tool(build, s.stage, s.target, "qemu-test-client"));
 +         .run(move |s| compile::tool(build, s.stage, s.target, "remote-test-client"));
      rules.build("tool-cargo", "cargo")
+          .host(true)
+          .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"))