]> git.lizzy.rs Git - rust.git/commitdiff
Fixes other targets rustlibs installation
authorGitLab <gitlab@ebarreto>
Mon, 13 Mar 2017 17:44:54 +0000 (14:44 -0300)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 5 Apr 2017 00:16:42 +0000 (17:16 -0700)
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

src/bootstrap/install.rs

index 249f241a151bbd446dc3fc5c92661b954ceba9e2..25082e3a9d095645d68c8528c1a1fb915d62ddcc 100644 (file)
@@ -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));