From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Thu, 27 Apr 2017 09:53:18 +0000 (+0200)
Subject: rustbuild: install cargo and rls when extended build is enabled
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=03c57975525004710b8b6bf61a1431b77ea15b14;p=rust.git

rustbuild: install cargo and rls when extended build is enabled

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
---

diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index e99451fd52d..b8dde1df729 100644
--- a/src/bootstrap/install.rs
+++ b/src/bootstrap/install.rs
@@ -51,12 +51,20 @@ pub fn install(build: &Build, stage: u32, host: &str) {
     }
 
     for target in build.config.target.iter() {
-        install_sh(&build, "std", "rust-std", &build.rust_package_vers(), stage, target, &prefix,
-                   &docdir, &libdir, &mandir, &empty_dir);
+        install_sh(&build, "std", "rust-std", &build.rust_package_vers(),
+                   stage, target, &prefix, &docdir, &libdir, &mandir, &empty_dir);
+    }
+
+    install_sh(&build, "rustc", "rustc", &build.rust_package_vers(),
+               stage, host, &prefix, &docdir, &libdir, &mandir, &empty_dir);
+
+    if build.config.extended {
+        install_sh(&build, "cargo", "cargo", &build.cargo_package_vers(),
+                   stage, host, &prefix, &docdir, &libdir, &mandir, &empty_dir);
+        install_sh(&build, "rls", "rls", &build.rls_package_vers(),
+                   stage, host, &prefix, &docdir, &libdir, &mandir, &empty_dir);
     }
 
-    install_sh(&build, "rustc", "rustc", &build.rust_package_vers(), stage, host, &prefix,
-               &docdir, &libdir, &mandir, &empty_dir);
     t!(fs::remove_dir_all(&empty_dir));
 }