From 9cee7b92ea492f9a879c88ae0ca2c1f791bdec97 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Fri, 8 Sep 2017 00:05:18 -0500 Subject: [PATCH 01/29] Require static native libraries when linking static executables --- src/librustc_codegen_llvm/back/link.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/librustc_codegen_llvm/back/link.rs b/src/librustc_codegen_llvm/back/link.rs index 845a66c6e4..f61318affc 100644 --- a/src/librustc_codegen_llvm/back/link.rs +++ b/src/librustc_codegen_llvm/back/link.rs @@ -1551,8 +1551,8 @@ fn add_upstream_rust_crates(cmd: &mut dyn Linker, } } -// Link in all of our upstream crates' native dependencies. Remember that -// all of these upstream native dependencies are all non-static +// Link in all of our upstream crates' native dependencies. Remember that when +// linking libraries, these upstream native dependencies are all non-static // dependencies. We've got two cases then: // // 1. The upstream crate is an rlib. In this case we *must* link in the @@ -1596,7 +1596,14 @@ fn add_upstream_native_libraries(cmd: &mut dyn Linker, continue } match lib.kind { - NativeLibraryKind::NativeUnknown => cmd.link_dylib(&name.as_str()), + NativeLibraryKind::NativeUnknown => { + // When creating executables, match library linkage to that of the executable. + if crate_type == config::CrateTypeExecutable && sess.crt_static() { + cmd.link_staticlib(&name.as_str()) + } else { + cmd.link_dylib(&name.as_str()) + } + }, NativeLibraryKind::NativeFramework => cmd.link_framework(&name.as_str()), NativeLibraryKind::NativeStaticNobundle => { // Link "static-nobundle" native libs only if the crate they originate from -- 2.18.0