Skip to content

Commit 0c7c8a7

Browse files
Rollup merge of rust-lang#117328 - lqd:cranelift-rocket, r=Mark-Simulacrum
pass `CODEGEN_BACKENDS` to docker The backends to build are now defined in the `CODEGEN_BACKENDS` env var. It's correctly set in CI, but wasn't passed to docker, hence cg_clif wasn't actually built in rust-lang#81746. r? `@Kobzol:` I locally tried `CODEGEN_BACKENDS="cranelift" DEPLOY=1 src/ci/docker/run.sh dist-x86_64-linux` and this change was enough for `ci/run.sh` to read the env var. So I'll try as-is and we'll see.
2 parents e0ff30d + aefd7ac commit 0c7c8a7

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/bootstrap/src/core/build_steps/dist.rs

+7
Original file line numberDiff line numberDiff line change
@@ -1305,6 +1305,10 @@ impl Step for CodegenBackend {
13051305
return None;
13061306
}
13071307

1308+
if !builder.config.rust_codegen_backends.contains(&self.backend) {
1309+
return None;
1310+
}
1311+
13081312
if self.backend == "cranelift" {
13091313
if !target_supports_cranelift_backend(self.compiler.host) {
13101314
builder.info("target not supported by rustc_codegen_cranelift. skipping");
@@ -1343,12 +1347,15 @@ impl Step for CodegenBackend {
13431347
let backends_dst = PathBuf::from("lib").join(&backends_rel);
13441348

13451349
let backend_name = format!("rustc_codegen_{}", backend);
1350+
let mut found_backend = false;
13461351
for backend in fs::read_dir(&backends_src).unwrap() {
13471352
let file_name = backend.unwrap().file_name();
13481353
if file_name.to_str().unwrap().contains(&backend_name) {
13491354
tarball.add_file(backends_src.join(file_name), &backends_dst, 0o644);
1355+
found_backend = true;
13501356
}
13511357
}
1358+
assert!(found_backend);
13521359

13531360
Some(tarball.generate())
13541361
}

src/ci/docker/run.sh

+1
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ docker \
288288
--env DIST_TRY_BUILD \
289289
--env PR_CI_JOB \
290290
--env OBJDIR_ON_HOST="$objdir" \
291+
--env CODEGEN_BACKENDS \
291292
--init \
292293
--rm \
293294
rust-ci \

0 commit comments

Comments
 (0)