From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Thu, 27 Apr 2017 09:52:48 +0000 (+0200)
Subject: rustbuild: pass version number as param in install phase
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=c4c3b5a44396907e8689eefe8e517cd7a26ac9af;p=rust.git

rustbuild: pass version number as param in install phase

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

diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index d508616e4b1..e99451fd52d 100644
--- a/src/bootstrap/install.rs
+++ b/src/bootstrap/install.rs
@@ -46,24 +46,24 @@ pub fn install(build: &Build, stage: u32, host: &str) {
     let empty_dir = build.out.join("tmp/empty_dir");
     t!(fs::create_dir_all(&empty_dir));
     if build.config.docs {
-        install_sh(&build, "docs", "rust-docs", stage, host, &prefix,
-                   &docdir, &libdir, &mandir, &empty_dir);
+        install_sh(&build, "docs", "rust-docs", &build.rust_package_vers(),
+                   stage, host, &prefix, &docdir, &libdir, &mandir, &empty_dir);
     }
 
     for target in build.config.target.iter() {
-        install_sh(&build, "std", "rust-std", stage, target, &prefix,
+        install_sh(&build, "std", "rust-std", &build.rust_package_vers(), stage, target, &prefix,
                    &docdir, &libdir, &mandir, &empty_dir);
     }
 
-    install_sh(&build, "rustc", "rustc", stage, host, &prefix,
+    install_sh(&build, "rustc", "rustc", &build.rust_package_vers(), stage, host, &prefix,
                &docdir, &libdir, &mandir, &empty_dir);
     t!(fs::remove_dir_all(&empty_dir));
 }
 
-fn install_sh(build: &Build, package: &str, name: &str, stage: u32, host: &str,
+fn install_sh(build: &Build, package: &str, name: &str, version: &str, stage: u32, host: &str,
               prefix: &Path, docdir: &Path, libdir: &Path, mandir: &Path, empty_dir: &Path) {
     println!("Install {} stage{} ({})", package, stage, host);
-    let package_name = format!("{}-{}-{}", name, build.rust_package_vers(), host);
+    let package_name = format!("{}-{}-{}", name, version, host);
 
     let mut cmd = Command::new("sh");
     cmd.current_dir(empty_dir)