From 7b1fb8964119e01899869d8a2e74896f82ae4be4 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Thu, 27 Apr 2017 15:05:29 +0200 Subject: [PATCH] rustbuild: install rustc after cargo and rls This way its files take precedence (e.g. README.md and stuff) Signed-off-by: Marc-Antoine Perennou --- src/bootstrap/install.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs index b8dde1df729..c805522fbf5 100644 --- a/src/bootstrap/install.rs +++ b/src/bootstrap/install.rs @@ -55,9 +55,6 @@ pub fn install(build: &Build, stage: u32, host: &str) { 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); @@ -65,6 +62,9 @@ pub fn install(build: &Build, stage: u32, host: &str) { 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)); }