Auto merge of #117535 - RalfJung:revert-cranelift, r=onur-ozkan · rust-lang/rust@adda05f (original) (raw)

File tree

lines changed

lines changed

Original file line number	Diff line number	Diff line change
@@ -1298,21 +1298,13 @@ impl Step for CodegenBackend {
1298	1298	}
1299	1299
1300	1300	fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
1301		-if builder.config.dry_run() {
1302		-return None;
1303		-}
1304		-
1305	1301	// This prevents rustc_codegen_cranelift from being built for "dist"
1306	1302	// or "install" on the stable/beta channels. It is not yet stable and
1307	1303	// should not be included.
1308	1304	if !builder.build.unstable_features() {
1309	1305	return None;
1310	1306	}
1311	1307
1312		-if !builder.config.rust_codegen_backends.contains(&self.backend) {
1313		-return None;
1314		-}
1315		-
1316	1308	if self.backend == "cranelift" {
1317	1309	if !target_supports_cranelift_backend(self.compiler.host) {
1318	1310	builder.info("target not supported by rustc_codegen_cranelift. skipping");
@@ -1351,15 +1343,12 @@ impl Step for CodegenBackend {
1351	1343	let backends_dst = PathBuf::from("lib").join(&backends_rel);
1352	1344
1353	1345	let backend_name = format!("rustc_codegen_{}", backend);
1354		-let mut found_backend = false;
1355	1346	for backend in fs::read_dir(&backends_src).unwrap() {
1356	1347	let file_name = backend.unwrap().file_name();
1357	1348	if file_name.to_str().unwrap().contains(&backend_name) {
1358	1349	tarball.add_file(backends_src.join(file_name), &backends_dst, 0o644);
1359		- found_backend = true;
1360	1350	}
1361	1351	}
1362		-assert!(found_backend);
1363	1352
1364	1353	Some(tarball.generate())
1365	1354	}