OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #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 #32984
This commit is contained in:
bors 2016-04-20 14:58:20 -07:00
parent a0c3259803 6ff8f4a34a
commit 95545e7adc
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bootstrap/build/step.rs
View File

@ -405,7 +405,14 @@ impl<'a> Step<'a> {
vec![self.rustc(stage)]
}
Source::DistStd { compiler } => {
vec![self.libtest(compiler)]
// We want to package up as many target libraries as possible
// for the `rust-std` package, so if this is a host target we
// depend on librustc and otherwise we just depend on libtest.
if build.config.host.iter().any(|t| t == self.target) {
vec![self.librustc(compiler)]
} else {
vec![self.libtest(compiler)]
}
}
Source::Dist { stage } => {