diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-09-23 11:20:46 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2024-09-23 11:20:46 +0000 |
| commit | b40fe1ee2826a52b2f21c31c43d06caea40885c8 (patch) | |
| tree | a400cd030ebfaed52706eabfba83888e3f295bbc /compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs | |
| parent | a772336fb3fbd1fe4493077fcfe04e0221296a99 (diff) | |
| parent | 6d35b4c9a04580366fd800692a5b5db79d766530 (diff) | |
| download | rust-b40fe1ee2826a52b2f21c31c43d06caea40885c8.tar.gz rust-b40fe1ee2826a52b2f21c31c43d06caea40885c8.zip | |
Merge commit '6d35b4c9a04580366fd800692a5b5db79d766530' into sync_cg_clif-2024-09-22
Diffstat (limited to 'compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs b/compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs index c0873a20e53..9292778806a 100644 --- a/compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs +++ b/compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs @@ -14,7 +14,6 @@ static ABI_CAFE_REPO: GitRepo = GitRepo::github( static ABI_CAFE: CargoProject = CargoProject::new(&ABI_CAFE_REPO.source_dir(), "abi_cafe_target"); pub(crate) fn run( - channel: &str, sysroot_kind: SysrootKind, dirs: &Dirs, cg_clif_dylib: &CodegenBackend, @@ -28,7 +27,6 @@ pub(crate) fn run( eprintln!("Building sysroot for abi-cafe"); build_sysroot::build_sysroot( dirs, - channel, sysroot_kind, cg_clif_dylib, bootstrap_host_compiler, @@ -38,12 +36,11 @@ pub(crate) fn run( eprintln!("Running abi-cafe"); - let pairs = ["rustc_calls_cgclif", "cgclif_calls_rustc", "cgclif_calls_cc", "cc_calls_cgclif"]; - let pairs = + let pairs: &[_] = if cfg!(not(any(target_os = "macos", all(target_os = "windows", target_env = "msvc")))) { - &pairs[..] + &["rustc_calls_cgclif", "cgclif_calls_rustc", "cgclif_calls_cc", "cc_calls_cgclif"] } else { - &pairs[..2] + &["rustc_calls_cgclif", "cgclif_calls_rustc"] }; let mut cmd = ABI_CAFE.run(bootstrap_host_compiler, dirs); |