diff options
| author | bors <bors@rust-lang.org> | 2019-08-07 16:56:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-07 16:56:46 +0000 |
| commit | ad7c55e1fc55d9af4787b285cec1c64e3480ae84 (patch) | |
| tree | ab629e87d6789d951b3f530231c5101874c711fc /src/libstd/sys_common | |
| parent | 647ed20e439e48f7ea88cebc6cad17cb85e63a3d (diff) | |
| parent | ebb648d4fbda07477ab9454dfda98187cd26aa34 (diff) | |
| download | rust-ad7c55e1fc55d9af4787b285cec1c64e3480ae84.tar.gz rust-ad7c55e1fc55d9af4787b285cec1c64e3480ae84.zip | |
Auto merge of #60547 - redox-os:redox-unix, r=alexcrichton
redox: convert to target_family unix This is the second step to supporting rust-lang/rust#60139. In order to have a smooth transition, there will need to be a change made in liblibc at the same time, switching Redox over to the unix target family. See https://github.com/rust-lang/libc/pull/1332
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/mod.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs index 13a59f66c5c..9190a3b0d5f 100644 --- a/src/libstd/sys_common/mod.rs +++ b/src/libstd/sys_common/mod.rs @@ -68,7 +68,6 @@ pub mod fs; cfg_if::cfg_if! { if #[cfg(any(target_os = "cloudabi", target_os = "l4re", - target_os = "redox", all(target_arch = "wasm32", not(target_os = "emscripten")), all(target_vendor = "fortanix", target_env = "sgx")))] { pub use crate::sys::net; |