mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc cleanups

Browse Source
This commit is contained in:
bjorn3 2024-09-13 15:00:14 +00:00
parent bc67321c6d
commit d5e2e23f48
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build_system/abi_cafe.rs
View File

@ -36,12 +36,11 @@ pub(crate) fn run(
eprintln!("Running abi-cafe"); 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")))) { 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 { } else {
&pairs[..2] &["rustc_calls_cgclif", "cgclif_calls_rustc"]
}; };
let mut cmd = ABI_CAFE.run(bootstrap_host_compiler, dirs); let mut cmd = ABI_CAFE.run(bootstrap_host_compiler, dirs);

4
build_system/build_backend.rs
View File

@ -18,8 +18,8 @@ pub(crate) fn build_backend(
let mut cmd = CG_CLIF.build(&bootstrap_host_compiler, dirs); let mut cmd = CG_CLIF.build(&bootstrap_host_compiler, dirs);
let mut rustflags = rustflags_from_env("RUSTFLAGS"); let mut rustflags = rustflags_from_env("RUSTFLAGS");
rustflags.push("-Zallow-features=rustc_private".to_owned()); rustflags.push("-Zallow-features=rustc_private".to_owned());
rustflags_to_cmd_env(&mut cmd, "RUSTFLAGS", &rustflags);
if env::var("CG_CLIF_EXPENSIVE_CHECKS").is_ok() { if env::var("CG_CLIF_EXPENSIVE_CHECKS").is_ok() {
// Enabling debug assertions implicitly enables the clif ir verifier // Enabling debug assertions implicitly enables the clif ir verifier
@ -33,8 +33,6 @@ pub(crate) fn build_backend(
cmd.arg("--release"); cmd.arg("--release");
rustflags_to_cmd_env(&mut cmd, "RUSTFLAGS", &rustflags);
eprintln!("[BUILD] rustc_codegen_cranelift"); eprintln!("[BUILD] rustc_codegen_cranelift");
crate::utils::spawn_and_wait(cmd); crate::utils::spawn_and_wait(cmd);