Skip to content

Commit 95545e7

Browse files
committed
Auto merge of rust-lang#33011 - alexcrichton:pkg-everything, r=brson
rustbuild: Package librustc & co for cross-hosts Currently the `rust-std` package produced by rustbuild only contains the standard library plus libtest, but the makefiles actually produce a `rust-std` package with all known target libraries (including libsyntax, librustc, etc). Tweak the behavior so the dependencies of the `dist-docs` step in rustbuild depend on the compiler libraries as well (so that they're all packaged). Closes rust-lang#32984
2 parents a0c3259 + 6ff8f4a commit 95545e7

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/bootstrap/build/step.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,14 @@ impl<'a> Step<'a> {
405405
vec![self.rustc(stage)]
406406
}
407407
Source::DistStd { compiler } => {
408-
vec![self.libtest(compiler)]
408+
// We want to package up as many target libraries as possible
409+
// for the `rust-std` package, so if this is a host target we
410+
// depend on librustc and otherwise we just depend on libtest.
411+
if build.config.host.iter().any(|t| t == self.target) {
412+
vec![self.librustc(compiler)]
413+
} else {
414+
vec![self.libtest(compiler)]
415+
}
409416
}
410417

411418
Source::Dist { stage } => {

0 commit comments

Comments
 (0)