about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGitLab <gitlab@ebarreto>2017-03-13 14:44:54 -0300
committerAlex Crichton <alex@alexcrichton.com>2017-04-04 17:16:42 -0700
commit56902fbe71b9b0a9b327972412fca085a8770e61 (patch)
tree50f637d56b88ec943c5e91092f27fb482d19185d
parent2564711e803f62e04bebf10408cc1c11297c0caf (diff)
downloadrust-56902fbe71b9b0a9b327972412fca085a8770e61.tar.gz
rust-56902fbe71b9b0a9b327972412fca085a8770e61.zip
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));