about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-12-02 20:16:51 -0800
committerbors <bors@rust-lang.org>2013-12-02 20:16:51 -0800
commitfc3b7c14508233a73d2252dc7b899e4b6ea46788 (patch)
tree05a239051075c06f49e414382bdac50edfd9c7b0
parent8cb59d3868870b1e41e53e75e17272c94eeb1702 (diff)
parent837a770b2147bd13ad3fb4ee7ce12f6eb3f07276 (diff)
downloadrust-fc3b7c14508233a73d2252dc7b899e4b6ea46788.tar.gz
rust-fc3b7c14508233a73d2252dc7b899e4b6ea46788.zip
auto merge of #10770 : alexcrichton/rust/static-librustrt, r=alexcrichton
This wasn't uncovered during testing because the librustrt is available locally
in the build directory (and it needs to be for all the tests to link against it
as well).

Closes #10765
-rw-r--r--src/libextra/flate.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libextra/flate.rs b/src/libextra/flate.rs
index a4a10ccfa73..5ebbbb2bbd6 100644
--- a/src/libextra/flate.rs
+++ b/src/libextra/flate.rs
@@ -23,7 +23,7 @@ use std::vec;
 pub mod rustrt {
     use std::libc::{c_int, c_void, size_t};
 
-    #[link(name = "rustrt")]
+    #[link(name = "rustrt", kind = "static")]
     extern {
         pub fn tdefl_compress_mem_to_heap(psrc_buf: *c_void,
                                           src_buf_len: size_t,