---

yaml
---
r: 107209
b: refs/heads/try
c: 9ed82c7
h: refs/heads/master
i:
  107207: 15506d2
v: v3

Author: emberian

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: b8ef9fd9c9f642ce7b8aed82782a1ed745d08d64
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b8601a3d8b91ad3b653d143307611f2f5c75617e
-refs/heads/try: 97063727d791fc75c4704e5838a1b7513691031f
+refs/heads/try: 9ed82c72cadca269d8ec3fa15513cb5593a8a38e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/liblibc/lib.rs

@@ -197,6 +197,11 @@ pub use funcs::posix88::unistd::{execv, execve, execvp, getcwd};
 pub use funcs::posix88::unistd::{getpid, isatty, lseek, pipe, read};
 pub use funcs::posix88::unistd::{rmdir, unlink, write};
 
+#[cfg(not(windows))]
+#[link(name = "c")]
+#[link(name = "m")]
+extern {}
+
 /// A wrapper for a nullable pointer. Don't use this except for interacting
 /// with libc. Basically Option, but without the dependance on libstd.
 // If/when libprim happens, this can be removed in favor of that

branches/try/src/librustc/middle/trans/context.rs

@@ -29,7 +29,6 @@ use util::sha2::Sha256;
 use util::nodemap::{NodeMap, NodeSet, DefIdMap};
 
 use libc::c_uint;
-use collections::{HashMap, HashSet};
 use std::cell::{Cell, RefCell};
 use std::c_str::ToCStr;
 use std::ptr;

branches/try/src/libstd/rtdeps.rs

@@ -22,17 +22,13 @@ extern {}
 // On linux librt and libdl are indirect dependencies via rustrt,
 // and binutils 2.22+ won't add them automatically
 #[cfg(target_os = "linux")]
-#[link(name = "c")]
 #[link(name = "dl")]
-#[link(name = "m")]
 #[link(name = "pthread")]
 extern {}
 
 #[cfg(target_os = "android")]
 #[link(name = "dl")]
 #[link(name = "log")]
-#[link(name = "m")]
-#[link(name = "c")]
 extern {}
 
 #[cfg(target_os = "freebsd")]