From 03c57975525004710b8b6bf61a1431b77ea15b14 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Thu, 27 Apr 2017 11:53:18 +0200 Subject: [PATCH] rustbuild: install cargo and rls when extended build is enabled Signed-off-by: Marc-Antoine Perennou --- src/bootstrap/install.rs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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)); } -- 2.44.0