bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustbuild: build cargo and rls as part of extended build

Browse source 
Build them directly in the `./x.py build` phase, don't wait for
`./x.py dist`

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
This commit is contained in:
Marc-Antoine Perennou 2017-04-27 11:51:02 +02:00
parent 54ef80043a
commit f5929037cc
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/step.rs
View file

@ -575,6 +575,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
.dep(|s| s.name("libstd-tool")) .dep(|s| s.name("libstd-tool"))
.run(move |s| compile::tool(build, s.stage, s.target, "qemu-test-client")); .run(move |s| compile::tool(build, s.stage, s.target, "qemu-test-client"));
rules.build("tool-cargo", "cargo") rules.build("tool-cargo", "cargo")
.default(build.config.extended)
.dep(|s| s.name("maybe-clean-tools")) .dep(|s| s.name("maybe-clean-tools"))
.dep(|s| s.name("libstd-tool")) .dep(|s| s.name("libstd-tool"))
.dep(|s| s.stage(0).host(s.target).name("openssl")) .dep(|s| s.stage(0).host(s.target).name("openssl"))
@ -588,6 +589,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
.run(move |s| compile::tool(build, s.stage, s.target, "cargo")); .run(move |s| compile::tool(build, s.stage, s.target, "cargo"));
rules.build("tool-rls", "rls") rules.build("tool-rls", "rls")
.host(true) .host(true)
.default(build.config.extended)
.dep(|s| s.name("librustc-tool")) .dep(|s| s.name("librustc-tool"))
.dep(|s| s.stage(0).host(s.target).name("openssl")) .dep(|s| s.stage(0).host(s.target).name("openssl"))
.dep(move |s| { .dep(move |s| {