Pass -C prefer-dynamic for dylib dependencies

alexcrichton · alexcrichton · commit 9879a0a5f621 · 2014-11-06T08:58:01.000-08:00
diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs
@@ -491,7 +491,10 @@ fn build_base_args(cx: &Context,
                          .rpath(root_profile.get_rpath())
     }
 
-    if profile.is_for_host() {
+    let prefer_dynamic = profile.is_for_host() ||
+                         (crate_types.contains(&"dylib") &&
+                          pkg.get_package_id() != cx.resolve.root());
+    if prefer_dynamic {
         cmd = cmd.arg("-C").arg("prefer-dynamic");
     }
 
diff --git a/tests/test_cargo_compile.rs b/tests/test_cargo_compile.rs
@@ -819,7 +819,7 @@ test!(verbose_release_build_deps {
                 execs().with_status(0).with_stdout(format!("\
 {compiling} foo v0.0.0 ({url})
 {running} `rustc {dir}{sep}foo{sep}src{sep}lib.rs --crate-name foo \
-        --crate-type dylib --crate-type rlib \
+        --crate-type dylib --crate-type rlib -C prefer-dynamic \
         --opt-level 3 \
         --cfg ndebug \
         -C metadata=[..] \
diff --git a/tests/test_cargo_profiles.rs b/tests/test_cargo_profiles.rs
@@ -82,7 +82,7 @@ test!(top_level_overrides_deps {
                 execs().with_status(0).with_stdout(format!("\
 {compiling} foo v0.0.0 ({url})
 {running} `rustc {dir}{sep}foo{sep}src{sep}lib.rs --crate-name foo \
-        --crate-type dylib --crate-type rlib \
+        --crate-type dylib --crate-type rlib -C prefer-dynamic \
         --opt-level 1 \
         -g \
         -C metadata=[..] \

Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,10 @@ fn build_base_args(cx: &Context,`
`491`	`491`	`.rpath(root_profile.get_rpath())`
`492`	`492`	`}`
`493`	`493`
`494`		`- if profile.is_for_host() {`
	`494`	`+ let prefer_dynamic = profile.is_for_host() \|\|`
	`495`	`+ (crate_types.contains(&"dylib") &&`
	`496`	`+ pkg.get_package_id() != cx.resolve.root());`
	`497`	`+ if prefer_dynamic {`
`495`	`498`	`cmd = cmd.arg("-C").arg("prefer-dynamic");`
`496`	`499`	`}`
`497`	`500`