Use target_env instead of target_libc.

Author: DiamondLovesYou

mk/cfg/le32-unknown-nacl.mk

@@ -34,7 +34,7 @@ SHARED_LIBS_DISABLED_le32-unknown-nacl := 1
 RUNTIME_CFLAGS_le32-unknown-nacl:= -I$(CFG_NACL_CROSS_PATH)/include/pnacl
 RUNTIME_DISABLE_ASM_le32-unknown-nacl := 1
 RUSTC_FLAGS_le32-unknown-nacl:=
-RUSTC_CROSS_FLAGS_le32-unknown-nacl=-C cross-path=$(CFG_NACL_CROSS_PATH) --cfg "target_libc=\"newlib\"" -L $(CFG_NACL_CROSS_PATH)/lib/pnacl/Release -L $(CFG_PNACL_TOOLCHAIN)/lib/clang/3.7.0/lib/le32-nacl -L $(CFG_PNACL_TOOLCHAIN)/le32-nacl/usr/lib -L $(CFG_PNACL_TOOLCHAIN)/le32-nacl/lib
+RUSTC_CROSS_FLAGS_le32-unknown-nacl=-C cross-path=$(CFG_NACL_CROSS_PATH) -L $(CFG_NACL_CROSS_PATH)/lib/pnacl/Release -L $(CFG_PNACL_TOOLCHAIN)/lib/clang/3.7.0/lib/le32-nacl -L $(CFG_PNACL_TOOLCHAIN)/le32-nacl/usr/lib -L $(CFG_PNACL_TOOLCHAIN)/le32-nacl/lib
 CFG_GNU_TRIPLE_le32-unknown-nacl := le32-unknown-nacl
 
 # strdup isn't defined unless -std=gnu++11 is used

src/librustc_back/target/le32_unknown_nacl.rs

@@ -40,7 +40,7 @@ pub fn target() -> Target {
         target_endian: "little".to_string(),
         target_pointer_width: "32".to_string(),
         target_os: "nacl".to_string(),
-        target_env: "".to_string(),
+        target_env: "newlib".to_string(),
         arch: "le32".to_string(),
         options: opts,
     }

src/libstd/sys/unix/fs.rs

@@ -462,11 +462,11 @@ pub fn rmdir(p: &Path) -> io::Result<()> {
 }
 
 pub fn readlink(p: &Path) -> io::Result<PathBuf> {
-    #[cfg(not(target_libc = "newlib"))]
+    #[cfg(not(target_env = "newlib"))]
     unsafe fn pathconf(p: *mut libc::c_char) -> i64 {
         libc::pathconf(p, libc::_PC_NAME_MAX) as i64
     }
-    #[cfg(target_libc = "newlib")]
+    #[cfg(target_env = "newlib")]
     unsafe fn pathconf(_: *mut libc::c_char) -> i64 {
         libc::sysconf(libc::_PC_NAME_MAX) as i64
     }

src/libstd/sys/unix/os.rs

@@ -60,7 +60,7 @@ pub fn errno() -> i32 {
         extern { fn __errno_location() -> *const c_int; }
         __errno_location()
     }
-    #[cfg(target_libc = "newlib")]
+    #[cfg(target_env = "newlib")]
     fn errno_location() -> *const c_int {
         extern {
             fn __errno() -> *const c_int;

src/libstd/sys/unix/thread.rs

@@ -129,7 +129,7 @@ impl Thread {
             pthread_setname_np(cname.as_ptr());
         }
     }
-    #[cfg(target_libc = "newlib")]
+    #[cfg(target_env = "newlib")]
     pub unsafe fn set_name(_name: &str) {
         // Newlib has no way to set a thread name.
     }