Skip to content

Commit adda05f

Browse files
committed
Auto merge of rust-lang#117535 - RalfJung:revert-cranelift, r=onur-ozkan
Revert "Auto merge of rust-lang#117328 - lqd:cranelift-rocket, r=Mark-Simulacrum" This reverts commit 1dfb6b1, reversing changes made to bcb5798. That commit broke generating nightly rustc docs. Revert it until we can figure out how to have both, cranelift and docs. Fixes rust-lang#117430
2 parents 4911224 + f388498 commit adda05f

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

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

-11
Original file line numberDiff line numberDiff line change
@@ -1298,21 +1298,13 @@ impl Step for CodegenBackend {
12981298
}
12991299

13001300
fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
1301-
if builder.config.dry_run() {
1302-
return None;
1303-
}
1304-
13051301
// This prevents rustc_codegen_cranelift from being built for "dist"
13061302
// or "install" on the stable/beta channels. It is not yet stable and
13071303
// should not be included.
13081304
if !builder.build.unstable_features() {
13091305
return None;
13101306
}
13111307

1312-
if !builder.config.rust_codegen_backends.contains(&self.backend) {
1313-
return None;
1314-
}
1315-
13161308
if self.backend == "cranelift" {
13171309
if !target_supports_cranelift_backend(self.compiler.host) {
13181310
builder.info("target not supported by rustc_codegen_cranelift. skipping");
@@ -1351,15 +1343,12 @@ impl Step for CodegenBackend {
13511343
let backends_dst = PathBuf::from("lib").join(&backends_rel);
13521344

13531345
let backend_name = format!("rustc_codegen_{}", backend);
1354-
let mut found_backend = false;
13551346
for backend in fs::read_dir(&backends_src).unwrap() {
13561347
let file_name = backend.unwrap().file_name();
13571348
if file_name.to_str().unwrap().contains(&backend_name) {
13581349
tarball.add_file(backends_src.join(file_name), &backends_dst, 0o644);
1359-
found_backend = true;
13601350
}
13611351
}
1362-
assert!(found_backend);
13631352

13641353
Some(tarball.generate())
13651354
}

src/ci/docker/run.sh

-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ docker \
302302
--env DIST_TRY_BUILD \
303303
--env PR_CI_JOB \
304304
--env OBJDIR_ON_HOST="$objdir" \
305-
--env CODEGEN_BACKENDS \
306305
--init \
307306
--rm \
308307
rust-ci \

0 commit comments

Comments
 (0)