bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustbuild: pass version number as param in install phase

Browse source 
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
This commit is contained in:
Marc-Antoine Perennou 2017-04-27 11:52:48 +02:00
parent f5929037cc
commit c4c3b5a443
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/bootstrap/install.rs
View file

@ -46,24 +46,24 @@ pub fn install(build: &Build, stage: u32, host: &str) {
let empty_dir = build.out.join("tmp/empty_dir"); let empty_dir = build.out.join("tmp/empty_dir");
t!(fs::create_dir_all(&empty_dir)); t!(fs::create_dir_all(&empty_dir));
if build.config.docs { if build.config.docs {
install_sh(&build, "docs", "rust-docs", stage, host, &prefix, install_sh(&build, "docs", "rust-docs", &build.rust_package_vers(),
&docdir, &libdir, &mandir, &empty_dir); stage, host, &prefix, &docdir, &libdir, &mandir, &empty_dir);
} }
for target in build.config.target.iter() { 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); &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); &docdir, &libdir, &mandir, &empty_dir);
t!(fs::remove_dir_all(&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) { prefix: &Path, docdir: &Path, libdir: &Path, mandir: &Path, empty_dir: &Path) {
println!("Install {} stage{} ({})", package, stage, host); 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"); let mut cmd = Command::new("sh");
cmd.current_dir(empty_dir) cmd.current_dir(empty_dir)