bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Ensure the rustc-codegen-cranelift-preview component is never empty

Browse source 
Either generate it with the actual codegen backend dylib or omit it
entirely when the cranelift backend is disabled for this build.
This commit is contained in:
bjorn3 2023-10-28 19:11:51 +00:00
parent 794bf8a850
commit aefd7ace91
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/bootstrap/src/core/build_steps/dist.rs
View file

@ -1305,6 +1305,10 @@ impl Step for CodegenBackend {
return None;
}
if !builder.config.rust_codegen_backends.contains(&self.backend) {
return None;
}
if self.backend == "cranelift" {
if !target_supports_cranelift_backend(self.compiler.host) {
builder.info("target not supported by rustc_codegen_cranelift. skipping");
@ -1343,12 +1347,15 @@ impl Step for CodegenBackend {
let backends_dst = PathBuf::from("lib").join(&backends_rel);
let backend_name = format!("rustc_codegen_{}", backend);
let mut found_backend = false;
for backend in fs::read_dir(&backends_src).unwrap() {
let file_name = backend.unwrap().file_name();
if file_name.to_str().unwrap().contains(&backend_name) {
tarball.add_file(backends_src.join(file_name), &backends_dst, 0o644);
found_backend = true;
}
}
assert!(found_backend);
Some(tarball.generate())
}