about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAriel Ben-Yehuda <arielb1@mail.tau.ac.il>2017-04-05 23:01:03 +0000
committerGitHub <noreply@github.com>2017-04-05 23:01:03 +0000
commit540fc2c546797cab48565c07e5de78a062c5464f (patch)
treefb8deeeac12431b81d8331beb6bb3ff6f51c1fd5
parent91ae22a012fae7fa7589b1bba77bf4579708ee33 (diff)
parent56902fbe71b9b0a9b327972412fca085a8770e61 (diff)
downloadrust-540fc2c546797cab48565c07e5de78a062c5464f.tar.gz
rust-540fc2c546797cab48565c07e5de78a062c5464f.zip
Rollup merge of #40479 - sezaru:master, r=alexcrichton
Fixes other targets rustlibs installation

When the user select more than one target to generate rustlibs for, rustbuild will only install the host one.

This patch fixes it, more info in https://github.com/rust-lang/rust/issues/39235#issuecomment-285878858
-rw-r--r--src/bootstrap/install.rs9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index 249f241a151..25082e3a9d0 100644
--- a/src/bootstrap/install.rs
+++ b/src/bootstrap/install.rs
@@ -49,12 +49,17 @@ pub fn install(build: &Build, stage: u32, host: &str) {
         install_sh(&build, "docs", "rust-docs", stage, host, &prefix,
                    &docdir, &libdir, &mandir, &empty_dir);
     }
+
+    for target in build.config.target.iter() {
+        install_sh(&build, "std", "rust-std", stage, target, &prefix,
+                   &docdir, &libdir, &mandir, &empty_dir);
+    }
+
     if build.config.rust_save_analysis {
         install_sh(&build, "analysis", "rust-analysis", stage, host, &prefix,
                    &docdir, &libdir, &mandir, &empty_dir);
     }
-    install_sh(&build, "std", "rust-std", stage, host, &prefix,
-               &docdir, &libdir, &mandir, &empty_dir);
+
     install_sh(&build, "rustc", "rustc", stage, host, &prefix,
                &docdir, &libdir, &mandir, &empty_dir);
     t!(fs::remove_dir_all(&empty_dir));