summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-01-06 17:03:21 +0000
committerbors <bors@rust-lang.org>2017-01-06 17:03:21 +0000
commitc900083bbf5531280d8856048d17ecbc75d33d81 (patch)
tree019a357d3b076e54ffc4eb64225450d31c56501d
parent3ae8c850aa800c6c9440b65c6ea7cfc92731466d (diff)
parent74590038ae153c4e796c18d46457cf82f44e42ea (diff)
downloadrust-libc-c900083bbf5531280d8856048d17ecbc75d33d81.tar.gz
Auto merge of #488 - redox-os:redox, r=alexcrichton
Link libc and libm in Redox [critical] This is critical to being able to set up a proper cross compilation setup for Redox. Due to the way libc is vendored, I have to have this change merged in and have liblibc updated in the Rust repository as well before I can have a working buildbot for Redox.
-rw-r--r--src/redox.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/redox.rs b/src/redox.rs
index eb1ce0d9a4..b127812b87 100644
--- a/src/redox.rs
+++ b/src/redox.rs
@@ -51,3 +51,7 @@ s! {
extern {
pub fn memalign(align: ::size_t, size: ::size_t) -> *mut ::c_void;
}
+
+#[link(name = "c", kind = "static")]
+#[link(name = "m", kind = "static")]
+extern {}