bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge commit '6d355f6844' into sync_cg_clif-2023-12-31

Browse source
This commit is contained in:
bjorn3 2023-12-31 13:29:53 +00:00
commit d1d134e464
6 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_codegen_cranelift/src/driver/jit.rs
View file

@ -321,7 +321,7 @@ fn dep_symbol_lookup_fn(
Linkage::NotLinked | Linkage::IncludedFromDylib => {}
Linkage::Static => {
let name = crate_info.crate_name[&cnum];
let mut err = sess.struct_err(format!("Can't load static lib {}", name));
let mut err = sess.dcx().struct_err(format!("Can't load static lib {}", name));
err.note("rustc_codegen_cranelift can only load dylibs in JIT mode.");
err.emit();
}

2
compiler/rustc_codegen_cranelift/src/global_asm.rs
View file

@ -154,6 +154,8 @@ pub(crate) fn compile_global_asm(
}
} else {
let mut child = Command::new(std::env::current_exe().unwrap())
// Avoid a warning about the jobserver fd not being passed
.env_remove("CARGO_MAKEFLAGS")
.arg("--target")
.arg(&config.target)
.arg("--crate-type")