bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge commit '6d35b4c9a0' into sync_cg_clif-2024-09-22

Browse source
This commit is contained in:
bjorn3 2024-09-23 11:20:46 +00:00
commit b40fe1ee28
31 changed files with 487 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_codegen_cranelift/build_system/abi_cafe.rs
View file

@ -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);