Only build libtest when libstd is built

phil-opp · phil-opp · commit 18a897320b4a · 2019-09-13T15:23:46.000+02:00
diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs
@@ -398,7 +398,10 @@ pub fn compile_ws<'a>(
                 .iter()
                 .any(|unit| unit.mode.is_rustc_test() && unit.target.harness())
         {
-            crates.push("test".to_string());
+            // Only build libtest when libstd is built (libtest depends on libstd)
+            if crates.iter().any(|c| c == "std") {
+                crates.push("test".to_string());
+            }
         }
         standard_lib::generate_std_roots(&bcx, &crates, std_resolve.as_ref().unwrap())?
     } else {

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,10 @@ pub fn compile_ws<'a>(`
`398`	`398`	`.iter()`
`399`	`399`	`.any(\|unit\| unit.mode.is_rustc_test() && unit.target.harness())`
`400`	`400`	`{`
`401`		`- crates.push("test".to_string());`
	`401`	`+ // Only build libtest when libstd is built (libtest depends on libstd)`
	`402`	`+ if crates.iter().any(\|c\| c == "std") {`
	`403`	`+ crates.push("test".to_string());`
	`404`	`+ }`
`402`	`405`	`}`
`403`	`406`	`standard_lib::generate_std_roots(&bcx, &crates, std_resolve.as_ref().unwrap())?`
`404`	`407`	`} else {`