From 1ae1461fbf59db8db5dd2fe11bbe22c6adeb1aed Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 30 Jul 2014 07:44:20 -0700 Subject: rustc: Link entire archives of native libraries As discovered in #15460, a particular #[link(kind = "static", ...)] line is not actually guaranteed to link the library at all. The reason for this is that if the external library doesn't have any referenced symbols in the object generated by rustc, the entire library is dropped by the linker. For dynamic native libraries, this is solved by passing -lfoo for all downstream compilations unconditionally. For static libraries in rlibs this is solved because the entire archive is bundled in the rlib. The only situation in which this was a problem was when a static native library was linked to a rust dynamic library. This commit brings the behavior of dylibs in line with rlibs by passing the --whole-archive flag to the linker when linking native libraries. On OSX, this uses the -force_load flag. This flag ensures that the entire archive is considered candidate for being linked into the final dynamic library. This is a breaking change because if any static library is included twice in the same compilation unit then the linker will start emitting errors about duplicate definitions now. The fix for this would involve only statically linking to a library once. Closes #15460 [breaking-change] --- src/liballoc/heap.rs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/liballoc') diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs index dc8280e9b83..3175c516d8e 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -136,6 +136,9 @@ mod imp { use libc::{c_char, c_int, c_void, size_t}; #[link(name = "jemalloc", kind = "static")] + #[cfg(not(test))] + extern {} + extern { fn je_mallocx(size: size_t, flags: c_int) -> *mut c_void; fn je_rallocx(ptr: *mut c_void, size: size_t, -- cgit 1.4.1-3-g733a5