Skip to content

Commit f592903

Browse files
committed
rustbuild: build cargo and rls as part of extended build
Build them directly in the `./x.py build` phase, don't wait for `./x.py dist` Signed-off-by: Marc-Antoine Perennou <[email protected]>
1 parent 54ef800 commit f592903

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/bootstrap/step.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
575575
.dep(|s| s.name("libstd-tool"))
576576
.run(move |s| compile::tool(build, s.stage, s.target, "qemu-test-client"));
577577
rules.build("tool-cargo", "cargo")
578+
.default(build.config.extended)
578579
.dep(|s| s.name("maybe-clean-tools"))
579580
.dep(|s| s.name("libstd-tool"))
580581
.dep(|s| s.stage(0).host(s.target).name("openssl"))
@@ -588,6 +589,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
588589
.run(move |s| compile::tool(build, s.stage, s.target, "cargo"));
589590
rules.build("tool-rls", "rls")
590591
.host(true)
592+
.default(build.config.extended)
591593
.dep(|s| s.name("librustc-tool"))
592594
.dep(|s| s.stage(0).host(s.target).name("openssl"))
593595
.dep(move |s| {

0 commit comments

Comments
 (0)