diff options
| author | Takayuki Maeda <takoyaki0316@gmail.com> | 2023-11-14 00:54:18 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-14 00:54:18 +0900 |
| commit | b0a68a441447b571c0a4b0f7f9a3fc12e69537e9 (patch) | |
| tree | 8efed492b5ef47424d5355b931ef129f9f1bc375 | |
| parent | 19bffe1ea69571621ce1cd1d38e41492c02f7ac8 (diff) | |
| parent | 8e2da60f0de9ced272623338a43241f1544c0d58 (diff) | |
| download | rust-b0a68a441447b571c0a4b0f7f9a3fc12e69537e9.tar.gz rust-b0a68a441447b571c0a4b0f7f9a3fc12e69537e9.zip | |
Rollup merge of #117872 - Mark-Simulacrum:fwd-port-cranelift, r=onur-ozkan
Cranelift isn't available on non-nightly channels This commit already landed as part of beta branching, this PR just puts it on master.
| -rw-r--r-- | src/bootstrap/src/core/build_steps/dist.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index 950845b736f..c485481b9a1 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -1630,14 +1630,11 @@ impl Step for Extended { prepare("rust-analysis"); prepare("clippy"); prepare("rust-analyzer"); - for tool in &["rust-docs", "rust-demangler", "miri"] { + for tool in &["rust-docs", "rust-demangler", "miri", "rustc-codegen-cranelift"] { if built_tools.contains(tool) { prepare(tool); } } - if builder.config.rust_codegen_backends.contains(&INTERNER.intern_str("cranelift")) { - prepare("rustc-codegen-cranelift"); - } // create an 'uninstall' package builder.install(&etc.join("pkg/postinstall"), &pkg.join("uninstall"), 0o755); pkgbuild("uninstall"); |