Skip to content

Commit 540fc2c

Browse files
author
Ariel Ben-Yehuda
authored
Rollup merge of rust-lang#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 rust-lang#39235 (comment)
2 parents 91ae22a + 56902fb commit 540fc2c

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

Diff for: src/bootstrap/install.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,17 @@ pub fn install(build: &Build, stage: u32, host: &str) {
4949
install_sh(&build, "docs", "rust-docs", stage, host, &prefix,
5050
&docdir, &libdir, &mandir, &empty_dir);
5151
}
52+
53+
for target in build.config.target.iter() {
54+
install_sh(&build, "std", "rust-std", stage, target, &prefix,
55+
&docdir, &libdir, &mandir, &empty_dir);
56+
}
57+
5258
if build.config.rust_save_analysis {
5359
install_sh(&build, "analysis", "rust-analysis", stage, host, &prefix,
5460
&docdir, &libdir, &mandir, &empty_dir);
5561
}
56-
install_sh(&build, "std", "rust-std", stage, host, &prefix,
57-
&docdir, &libdir, &mandir, &empty_dir);
62+
5863
install_sh(&build, "rustc", "rustc", stage, host, &prefix,
5964
&docdir, &libdir, &mandir, &empty_dir);
6065
t!(fs::remove_dir_all(&empty_dir));

0 commit comments

Comments
 (0)