Rollup merge of #125369 - saethlin:synthetic-targets-dont-cc, r=onur-ozkan

matthiaskrgr · web-flow · commit d04e2e2858a3 · 2024-05-21T20:28:49.000+02:00
Don't do cc detection for synthetic targets Fixes #125365 Synthetic targets only exist for mir-opt tests, and the mir-opt test suite is in general designed to avoid any use of a C compiler. We don't need to do CC detection. It's unclear to me how this code didn't cause issues before.
diff --git a/src/bootstrap/src/core/build_steps/synthetic_targets.rs b/src/bootstrap/src/core/build_steps/synthetic_targets.rs
@@ -80,8 +80,5 @@ fn create_synthetic_target(
     customize(spec_map);
 
     std::fs::write(&path, serde_json::to_vec_pretty(&spec).unwrap()).unwrap();
-    let target = TargetSelection::create_synthetic(&name, path.to_str().unwrap());
-    crate::utils::cc_detect::find_target(builder, target);
-
-    target
+    TargetSelection::create_synthetic(&name, path.to_str().unwrap())
 }

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,5 @@ fn create_synthetic_target(`
`80`	`80`	`customize(spec_map);`
`81`	`81`
`82`	`82`	`std::fs::write(&path, serde_json::to_vec_pretty(&spec).unwrap()).unwrap();`
`83`		`- let target = TargetSelection::create_synthetic(&name, path.to_str().unwrap());`
`84`		`- crate::utils::cc_detect::find_target(builder, target);`
`85`		`-`
`86`		`- target`
	`83`	`+ TargetSelection::create_synthetic(&name, path.to_str().unwrap())`
`87`	`84`	`}`