about summary refs log tree commit diff
path: root/src/libstd/sys_common/gnu
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-02-08 03:55:13 +0000
committerbors <bors@rust-lang.org>2017-02-08 03:55:13 +0000
commit10f6a5c4431e09d355a0ba319a630e02a1e38361 (patch)
tree5a5240b8b3467d3a03b7bdfd407d6c9513464124 /src/libstd/sys_common/gnu
parentc14f87e3b0823407a91a283796bf78ef83d5fe99 (diff)
parent0a815ac816b7222554aa20b53c5fb01aa1f62616 (diff)
downloadrust-10f6a5c4431e09d355a0ba319a630e02a1e38361.tar.gz
rust-10f6a5c4431e09d355a0ba319a630e02a1e38361.zip
Auto merge of #39638 - frewsxcv:rollup, r=frewsxcv
Rollup of 13 pull requests

- Successful merges: #38764, #39361, #39372, #39374, #39400, #39426, #39431, #39459, #39482, #39545, #39593, #39620, #39621
- Failed merges:
Diffstat (limited to 'src/libstd/sys_common/gnu')
-rw-r--r--src/libstd/sys_common/gnu/libbacktrace.rs3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libstd/sys_common/gnu/libbacktrace.rs b/src/libstd/sys_common/gnu/libbacktrace.rs
index d464a13ad1d..0bdbeddb112 100644
--- a/src/libstd/sys_common/gnu/libbacktrace.rs
+++ b/src/libstd/sys_common/gnu/libbacktrace.rs
@@ -39,9 +39,6 @@ pub fn print(w: &mut Write, idx: isize, addr: *mut libc::c_void,
                       msg: *const libc::c_char,
                       errnum: libc::c_int);
     enum backtrace_state {}
-    #[link(name = "backtrace", kind = "static")]
-    #[cfg(all(not(test), not(cargobuild)))]
-    extern {}
 
     extern {
         fn backtrace_create_state(filename: *const libc::c_char,