Skip to content

Commit 4082d6a

Browse files
borsbors
committed
Auto merge of #146927 - Kobzol:install-clif, r=jieyouxu
Make it possible to `x install` Cranelift and LLVM bitcode linker It was not possible to install these before, as they were not in the install step description list. Fixes: #140331 r? `@jieyouxu`
2 parents c0ee51f + a223343 commit 4082d6a

File tree

2 files changed

+63
-52
lines changed

2 files changed

+63
-52
lines changed

‎src/bootstrap/src/core/builder/mod.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,6 +1221,8 @@ impl<'a> Builder<'a> {
12211221
install::Miri,
12221222
install::LlvmTools,
12231223
install::Src,
1224+
install::RustcCodegenCranelift,
1225+
install::LlvmBitcodeLinker
12241226
),
12251227
Kind::Run => describe!(
12261228
run::BuildManifest,

‎src/bootstrap/src/core/builder/tests.rs‎

Lines changed: 61 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2844,60 +2844,69 @@ mod snapshot {
28442844
// Using backslashes fails with `--set`
28452845
"--set", &format!("install.prefix={}", ctx.dir().display()).replace("\\", "/"),
28462846
"--set", &format!("install.sysconfdir={}", ctx.dir().display()).replace("\\", "/"),
2847-
"--set", "build.extended=true"
2847+
"--set", "build.extended=true",
2848+
// For Cranelift to be disted
2849+
"--build", "x86_64-unknown-linux-gnu",
2850+
"--host", "x86_64-unknown-linux-gnu"
28482851
])
2849-
.render_steps(), @r"
2850-
[build] llvm <host>
2851-
[build] rustc 0 <host> -> rustc 1 <host>
2852-
[build] rustc 0 <host> -> WasmComponentLd 1 <host>
2853-
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
2854-
[build] rustc 0 <host> -> Rustbook 1 <host>
2855-
[doc] unstable-book (book) <host>
2856-
[build] rustc 1 <host> -> std 1 <host>
2857-
[doc] book (book) <host>
2858-
[doc] book/first-edition (book) <host>
2859-
[doc] book/second-edition (book) <host>
2860-
[doc] book/2018-edition (book) <host>
2861-
[build] rustdoc 1 <host>
2862-
[doc] rustc 1 <host> -> standalone 2 <host>
2863-
[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]
2864-
[build] rustc 1 <host> -> rustc 2 <host>
2865-
[build] rustc 1 <host> -> WasmComponentLd 2 <host>
2866-
[build] rustc 1 <host> -> error-index 2 <host>
2867-
[doc] rustc 1 <host> -> error-index 2 <host>
2868-
[doc] nomicon (book) <host>
2869-
[doc] rustc 1 <host> -> reference (book) 2 <host>
2870-
[doc] rustdoc (book) <host>
2871-
[doc] rust-by-example (book) <host>
2872-
[build] rustc 0 <host> -> LintDocs 1 <host>
2873-
[doc] rustc (book) <host>
2874-
[doc] cargo (book) <host>
2875-
[doc] clippy (book) <host>
2876-
[doc] embedded-book (book) <host>
2877-
[doc] edition-guide (book) <host>
2878-
[doc] style-guide (book) <host>
2879-
[doc] rustc 1 <host> -> releases 2 <host>
2880-
[build] rustc 0 <host> -> RustInstaller 1 <host>
2881-
[dist] docs <host>
2882-
[dist] rustc 1 <host> -> std 1 <host>
2883-
[build] rustdoc 2 <host>
2884-
[build] rustc 1 <host> -> rust-analyzer-proc-macro-srv 2 <host>
2885-
[build] rustc 0 <host> -> GenerateCopyright 1 <host>
2886-
[dist] rustc <host>
2887-
[build] rustc 1 <host> -> cargo 2 <host>
2888-
[dist] rustc 1 <host> -> cargo 2 <host>
2889-
[build] rustc 1 <host> -> rust-analyzer 2 <host>
2890-
[dist] rustc 1 <host> -> rust-analyzer 2 <host>
2891-
[build] rustc 1 <host> -> rustfmt 2 <host>
2892-
[build] rustc 1 <host> -> cargo-fmt 2 <host>
2893-
[dist] rustc 1 <host> -> rustfmt 2 <host>
2894-
[build] rustc 1 <host> -> clippy-driver 2 <host>
2895-
[build] rustc 1 <host> -> cargo-clippy 2 <host>
2896-
[dist] rustc 1 <host> -> clippy 2 <host>
2897-
[build] rustc 1 <host> -> miri 2 <host>
2898-
[build] rustc 1 <host> -> cargo-miri 2 <host>
2899-
[dist] rustc 1 <host> -> miri 2 <host>
2852+
.get_steps()
2853+
.render_with(RenderConfig {
2854+
normalize_host: false
2855+
}), @r"
2856+
[build] llvm <x86_64-unknown-linux-gnu>
2857+
[build] rustc 0 <x86_64-unknown-linux-gnu> -> rustc 1 <x86_64-unknown-linux-gnu>
2858+
[build] rustc 0 <x86_64-unknown-linux-gnu> -> WasmComponentLd 1 <x86_64-unknown-linux-gnu>
2859+
[build] rustc 0 <x86_64-unknown-linux-gnu> -> UnstableBookGen 1 <x86_64-unknown-linux-gnu>
2860+
[build] rustc 0 <x86_64-unknown-linux-gnu> -> Rustbook 1 <x86_64-unknown-linux-gnu>
2861+
[doc] unstable-book (book) <x86_64-unknown-linux-gnu>
2862+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> std 1 <x86_64-unknown-linux-gnu>
2863+
[doc] book (book) <x86_64-unknown-linux-gnu>
2864+
[doc] book/first-edition (book) <x86_64-unknown-linux-gnu>
2865+
[doc] book/second-edition (book) <x86_64-unknown-linux-gnu>
2866+
[doc] book/2018-edition (book) <x86_64-unknown-linux-gnu>
2867+
[build] rustdoc 1 <x86_64-unknown-linux-gnu>
2868+
[doc] rustc 1 <x86_64-unknown-linux-gnu> -> standalone 2 <x86_64-unknown-linux-gnu>
2869+
[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]
2870+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> rustc 2 <x86_64-unknown-linux-gnu>
2871+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> WasmComponentLd 2 <x86_64-unknown-linux-gnu>
2872+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> error-index 2 <x86_64-unknown-linux-gnu>
2873+
[doc] rustc 1 <x86_64-unknown-linux-gnu> -> error-index 2 <x86_64-unknown-linux-gnu>
2874+
[doc] nomicon (book) <x86_64-unknown-linux-gnu>
2875+
[doc] rustc 1 <x86_64-unknown-linux-gnu> -> reference (book) 2 <x86_64-unknown-linux-gnu>
2876+
[doc] rustdoc (book) <x86_64-unknown-linux-gnu>
2877+
[doc] rust-by-example (book) <x86_64-unknown-linux-gnu>
2878+
[build] rustc 0 <x86_64-unknown-linux-gnu> -> LintDocs 1 <x86_64-unknown-linux-gnu>
2879+
[doc] rustc (book) <x86_64-unknown-linux-gnu>
2880+
[doc] cargo (book) <x86_64-unknown-linux-gnu>
2881+
[doc] clippy (book) <x86_64-unknown-linux-gnu>
2882+
[doc] embedded-book (book) <x86_64-unknown-linux-gnu>
2883+
[doc] edition-guide (book) <x86_64-unknown-linux-gnu>
2884+
[doc] style-guide (book) <x86_64-unknown-linux-gnu>
2885+
[doc] rustc 1 <x86_64-unknown-linux-gnu> -> releases 2 <x86_64-unknown-linux-gnu>
2886+
[build] rustc 0 <x86_64-unknown-linux-gnu> -> RustInstaller 1 <x86_64-unknown-linux-gnu>
2887+
[dist] docs <x86_64-unknown-linux-gnu>
2888+
[dist] rustc 1 <x86_64-unknown-linux-gnu> -> std 1 <x86_64-unknown-linux-gnu>
2889+
[build] rustdoc 2 <x86_64-unknown-linux-gnu>
2890+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> rust-analyzer-proc-macro-srv 2 <x86_64-unknown-linux-gnu>
2891+
[build] rustc 0 <x86_64-unknown-linux-gnu> -> GenerateCopyright 1 <x86_64-unknown-linux-gnu>
2892+
[dist] rustc <x86_64-unknown-linux-gnu>
2893+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> cargo 2 <x86_64-unknown-linux-gnu>
2894+
[dist] rustc 1 <x86_64-unknown-linux-gnu> -> cargo 2 <x86_64-unknown-linux-gnu>
2895+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> rust-analyzer 2 <x86_64-unknown-linux-gnu>
2896+
[dist] rustc 1 <x86_64-unknown-linux-gnu> -> rust-analyzer 2 <x86_64-unknown-linux-gnu>
2897+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> rustfmt 2 <x86_64-unknown-linux-gnu>
2898+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> cargo-fmt 2 <x86_64-unknown-linux-gnu>
2899+
[dist] rustc 1 <x86_64-unknown-linux-gnu> -> rustfmt 2 <x86_64-unknown-linux-gnu>
2900+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> clippy-driver 2 <x86_64-unknown-linux-gnu>
2901+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> cargo-clippy 2 <x86_64-unknown-linux-gnu>
2902+
[dist] rustc 1 <x86_64-unknown-linux-gnu> -> clippy 2 <x86_64-unknown-linux-gnu>
2903+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> miri 2 <x86_64-unknown-linux-gnu>
2904+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> cargo-miri 2 <x86_64-unknown-linux-gnu>
2905+
[dist] rustc 1 <x86_64-unknown-linux-gnu> -> miri 2 <x86_64-unknown-linux-gnu>
29002906
[dist] src <>
2907+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> rustc_codegen_cranelift 2 <x86_64-unknown-linux-gnu>
2908+
[dist] rustc 1 <x86_64-unknown-linux-gnu> -> rustc_codegen_cranelift 2 <x86_64-unknown-linux-gnu>
2909+
[build] rustc 1 <x86_64-unknown-linux-gnu> -> LlvmBitcodeLinker 2 <x86_64-unknown-linux-gnu>
29012910
");
29022911
}
29032912

0 commit comments

Comments
 (0)