Fix logic for determining prefer-dynamic for a dylib.

ehuss · ehuss · commit 48e0306c4275 · 2021-03-10T21:33:48.000-08:00
diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs
@@ -792,7 +792,7 @@ fn build_base_args(
     }
 
     let prefer_dynamic = (unit.target.for_host() && !unit.target.is_custom_build())
-        || (crate_types.contains(&CrateType::Dylib) && bcx.ws.members().any(|p| *p != unit.pkg));
+        || (crate_types.contains(&CrateType::Dylib) && !cx.is_primary_package(unit));
     if prefer_dynamic {
         cmd.arg("-C").arg("prefer-dynamic");
     }

Original file line number	Diff line number	Diff line change
`@@ -792,7 +792,7 @@ fn build_base_args(`
`792`	`792`	`}`
`793`	`793`
`794`	`794`	`let prefer_dynamic = (unit.target.for_host() && !unit.target.is_custom_build())`
`795`		`- \|\| (crate_types.contains(&CrateType::Dylib) && bcx.ws.members().any(\|p\| *p != unit.pkg));`
	`795`	`+ \|\| (crate_types.contains(&CrateType::Dylib) && !cx.is_primary_package(unit));`
`796`	`796`	`if prefer_dynamic {`
`797`	`797`	`cmd.arg("-C").arg("prefer-dynamic");`
`798`	`798`	`}`