diff options
| -rw-r--r-- | src/bootstrap/src/core/builder/mod.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/src/core/builder/tests.rs | 113 |
2 files changed, 63 insertions, 52 deletions
diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs index 049d2647bec..006dea4b98d 100644 --- a/src/bootstrap/src/core/builder/mod.rs +++ b/src/bootstrap/src/core/builder/mod.rs @@ -1221,6 +1221,8 @@ impl<'a> Builder<'a> { install::Miri, install::LlvmTools, install::Src, + install::RustcCodegenCranelift, + install::LlvmBitcodeLinker ), Kind::Run => describe!( run::BuildManifest, diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs index 4555f0d2091..a3c8380a3c7 100644 --- a/src/bootstrap/src/core/builder/tests.rs +++ b/src/bootstrap/src/core/builder/tests.rs @@ -2844,60 +2844,69 @@ mod snapshot { // Using backslashes fails with `--set` "--set", &format!("install.prefix={}", ctx.dir().display()).replace("\\", "/"), "--set", &format!("install.sysconfdir={}", ctx.dir().display()).replace("\\", "/"), - "--set", "build.extended=true" + "--set", "build.extended=true", + // For Cranelift to be disted + "--build", "x86_64-unknown-linux-gnu", + "--host", "x86_64-unknown-linux-gnu" ]) - .render_steps(), @r" - [build] llvm <host> - [build] rustc 0 <host> -> rustc 1 <host> - [build] rustc 0 <host> -> WasmComponentLd 1 <host> - [build] rustc 0 <host> -> UnstableBookGen 1 <host> - [build] rustc 0 <host> -> Rustbook 1 <host> - [doc] unstable-book (book) <host> - [build] rustc 1 <host> -> std 1 <host> - [doc] book (book) <host> - [doc] book/first-edition (book) <host> - [doc] book/second-edition (book) <host> - [doc] book/2018-edition (book) <host> - [build] rustdoc 1 <host> - [doc] rustc 1 <host> -> standalone 2 <host> - [doc] rustc 1 <host> -> std 1 <host> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind] - [build] rustc 1 <host> -> rustc 2 <host> - [build] rustc 1 <host> -> WasmComponentLd 2 <host> - [build] rustc 1 <host> -> error-index 2 <host> - [doc] rustc 1 <host> -> error-index 2 <host> - [doc] nomicon (book) <host> - [doc] rustc 1 <host> -> reference (book) 2 <host> - [doc] rustdoc (book) <host> - [doc] rust-by-example (book) <host> - [build] rustc 0 <host> -> LintDocs 1 <host> - [doc] rustc (book) <host> - [doc] cargo (book) <host> - [doc] clippy (book) <host> - [doc] embedded-book (book) <host> - [doc] edition-guide (book) <host> - [doc] style-guide (book) <host> - [doc] rustc 1 <host> -> releases 2 <host> - [build] rustc 0 <host> -> RustInstaller 1 <host> - [dist] docs <host> - [dist] rustc 1 <host> -> std 1 <host> - [build] rustdoc 2 <host> - [build] rustc 1 <host> -> rust-analyzer-proc-macro-srv 2 <host> - [build] rustc 0 <host> -> GenerateCopyright 1 <host> - [dist] rustc <host> - [build] rustc 1 <host> -> cargo 2 <host> - [dist] rustc 1 <host> -> cargo 2 <host> - [build] rustc 1 <host> -> rust-analyzer 2 <host> - [dist] rustc 1 <host> -> rust-analyzer 2 <host> - [build] rustc 1 <host> -> rustfmt 2 <host> - [build] rustc 1 <host> -> cargo-fmt 2 <host> - [dist] rustc 1 <host> -> rustfmt 2 <host> - [build] rustc 1 <host> -> clippy-driver 2 <host> - [build] rustc 1 <host> -> cargo-clippy 2 <host> - [dist] rustc 1 <host> -> clippy 2 <host> - [build] rustc 1 <host> -> miri 2 <host> - [build] rustc 1 <host> -> cargo-miri 2 <host> - [dist] rustc 1 <host> -> miri 2 <host> + .get_steps() + .render_with(RenderConfig { + normalize_host: false + }), @r" + [build] llvm <x86_64-unknown-linux-gnu> + [build] rustc 0 <x86_64-unknown-linux-gnu> -> rustc 1 <x86_64-unknown-linux-gnu> + [build] rustc 0 <x86_64-unknown-linux-gnu> -> WasmComponentLd 1 <x86_64-unknown-linux-gnu> + [build] rustc 0 <x86_64-unknown-linux-gnu> -> UnstableBookGen 1 <x86_64-unknown-linux-gnu> + [build] rustc 0 <x86_64-unknown-linux-gnu> -> Rustbook 1 <x86_64-unknown-linux-gnu> + [doc] unstable-book (book) <x86_64-unknown-linux-gnu> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> std 1 <x86_64-unknown-linux-gnu> + [doc] book (book) <x86_64-unknown-linux-gnu> + [doc] book/first-edition (book) <x86_64-unknown-linux-gnu> + [doc] book/second-edition (book) <x86_64-unknown-linux-gnu> + [doc] book/2018-edition (book) <x86_64-unknown-linux-gnu> + [build] rustdoc 1 <x86_64-unknown-linux-gnu> + [doc] rustc 1 <x86_64-unknown-linux-gnu> -> standalone 2 <x86_64-unknown-linux-gnu> + [doc] rustc 1 <x86_64-unknown-linux-gnu> -> std 1 <x86_64-unknown-linux-gnu> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind] + [build] rustc 1 <x86_64-unknown-linux-gnu> -> rustc 2 <x86_64-unknown-linux-gnu> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> WasmComponentLd 2 <x86_64-unknown-linux-gnu> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> error-index 2 <x86_64-unknown-linux-gnu> + [doc] rustc 1 <x86_64-unknown-linux-gnu> -> error-index 2 <x86_64-unknown-linux-gnu> + [doc] nomicon (book) <x86_64-unknown-linux-gnu> + [doc] rustc 1 <x86_64-unknown-linux-gnu> -> reference (book) 2 <x86_64-unknown-linux-gnu> + [doc] rustdoc (book) <x86_64-unknown-linux-gnu> + [doc] rust-by-example (book) <x86_64-unknown-linux-gnu> + [build] rustc 0 <x86_64-unknown-linux-gnu> -> LintDocs 1 <x86_64-unknown-linux-gnu> + [doc] rustc (book) <x86_64-unknown-linux-gnu> + [doc] cargo (book) <x86_64-unknown-linux-gnu> + [doc] clippy (book) <x86_64-unknown-linux-gnu> + [doc] embedded-book (book) <x86_64-unknown-linux-gnu> + [doc] edition-guide (book) <x86_64-unknown-linux-gnu> + [doc] style-guide (book) <x86_64-unknown-linux-gnu> + [doc] rustc 1 <x86_64-unknown-linux-gnu> -> releases 2 <x86_64-unknown-linux-gnu> + [build] rustc 0 <x86_64-unknown-linux-gnu> -> RustInstaller 1 <x86_64-unknown-linux-gnu> + [dist] docs <x86_64-unknown-linux-gnu> + [dist] rustc 1 <x86_64-unknown-linux-gnu> -> std 1 <x86_64-unknown-linux-gnu> + [build] rustdoc 2 <x86_64-unknown-linux-gnu> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> rust-analyzer-proc-macro-srv 2 <x86_64-unknown-linux-gnu> + [build] rustc 0 <x86_64-unknown-linux-gnu> -> GenerateCopyright 1 <x86_64-unknown-linux-gnu> + [dist] rustc <x86_64-unknown-linux-gnu> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> cargo 2 <x86_64-unknown-linux-gnu> + [dist] rustc 1 <x86_64-unknown-linux-gnu> -> cargo 2 <x86_64-unknown-linux-gnu> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> rust-analyzer 2 <x86_64-unknown-linux-gnu> + [dist] rustc 1 <x86_64-unknown-linux-gnu> -> rust-analyzer 2 <x86_64-unknown-linux-gnu> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> rustfmt 2 <x86_64-unknown-linux-gnu> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> cargo-fmt 2 <x86_64-unknown-linux-gnu> + [dist] rustc 1 <x86_64-unknown-linux-gnu> -> rustfmt 2 <x86_64-unknown-linux-gnu> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> clippy-driver 2 <x86_64-unknown-linux-gnu> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> cargo-clippy 2 <x86_64-unknown-linux-gnu> + [dist] rustc 1 <x86_64-unknown-linux-gnu> -> clippy 2 <x86_64-unknown-linux-gnu> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> miri 2 <x86_64-unknown-linux-gnu> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> cargo-miri 2 <x86_64-unknown-linux-gnu> + [dist] rustc 1 <x86_64-unknown-linux-gnu> -> miri 2 <x86_64-unknown-linux-gnu> [dist] src <> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> rustc_codegen_cranelift 2 <x86_64-unknown-linux-gnu> + [dist] rustc 1 <x86_64-unknown-linux-gnu> -> rustc_codegen_cranelift 2 <x86_64-unknown-linux-gnu> + [build] rustc 1 <x86_64-unknown-linux-gnu> -> LlvmBitcodeLinker 2 <x86_64-unknown-linux-gnu> "); } |