diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2025-08-13 07:03:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-13 07:03:51 +0200 |
| commit | c4e82abe93f19878ba0ee09779ef18a53896150e (patch) | |
| tree | f6fd17b708e2e9bf2ce73b29ce9a7638cd4c3fdd | |
| parent | b60d5b3672f701f182f5c4f6315c83e2c0223ee3 (diff) | |
| parent | 614364c68107c21c417f5363553229a14c7e11c8 (diff) | |
| download | rust-c4e82abe93f19878ba0ee09779ef18a53896150e.tar.gz rust-c4e82abe93f19878ba0ee09779ef18a53896150e.zip | |
Rollup merge of #145320 - Kobzol:fix-cranelift-codegen-dist, r=shepmaster
Allow cross-compiling the Cranelift dist component Should help unblock https://github.com/rust-lang/rust/pull/145252 (https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/macos-13.20shutting.20down/with/534032174).
| -rw-r--r-- | src/bootstrap/src/core/build_steps/dist.rs | 5 | ||||
| -rw-r--r-- | src/bootstrap/src/core/build_steps/install.rs | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs index f9cb300b68e..e63f9e14efe 100644 --- a/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs @@ -1410,6 +1410,7 @@ impl Step for Miri { #[derive(Debug, Clone, Hash, PartialEq, Eq)] pub struct CraneliftCodegenBackend { pub build_compiler: Compiler, + pub target: TargetSelection, } impl Step for CraneliftCodegenBackend { @@ -1437,6 +1438,7 @@ impl Step for CraneliftCodegenBackend { run.builder.config.host_target, run.target, ), + target: run.target, }); } @@ -1448,7 +1450,7 @@ impl Step for CraneliftCodegenBackend { return None; } - let target = self.build_compiler.host; + let target = self.target; let compilers = RustcPrivateCompilers::from_build_compiler(builder, self.build_compiler, target); if !target_supports_cranelift_backend(target) { @@ -1608,6 +1610,7 @@ impl Step for Extended { add_component!("analysis" => Analysis { compiler, target }); add_component!("rustc-codegen-cranelift" => CraneliftCodegenBackend { build_compiler: compiler, + target }); add_component!("llvm-bitcode-linker" => LlvmBitcodeLinker { build_compiler: compiler, diff --git a/src/bootstrap/src/core/build_steps/install.rs b/src/bootstrap/src/core/build_steps/install.rs index 6d09e41e646..666f2715224 100644 --- a/src/bootstrap/src/core/build_steps/install.rs +++ b/src/bootstrap/src/core/build_steps/install.rs @@ -282,6 +282,7 @@ install!((self, builder, _config), RustcCodegenCranelift, alias = "rustc-codegen-cranelift", Self::should_build(_config), only_hosts: true, { if let Some(tarball) = builder.ensure(dist::CraneliftCodegenBackend { build_compiler: self.compiler, + target: self.target }) { install_sh(builder, "rustc-codegen-cranelift", self.compiler.stage, Some(self.target), &tarball); } else { |