diff options
| author | bors <bors@rust-lang.org> | 2017-07-15 14:51:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-15 14:51:02 +0000 |
| commit | a783fe2f77dfc69bdfbee539488403ff8883fd25 (patch) | |
| tree | 2f2b941613ea1aa7b2d62977052c3504f89398f7 /src/libstd/sys_common | |
| parent | c4373bd6a29e4f68becfb0874f3199b8b0c2d482 (diff) | |
| parent | e3825ecd4c4e79eff77cb0c2ed51447a8a344ce0 (diff) | |
| download | rust-a783fe2f77dfc69bdfbee539488403ff8883fd25.tar.gz rust-a783fe2f77dfc69bdfbee539488403ff8883fd25.zip | |
Auto merge of #43246 - frewsxcv:rollup, r=frewsxcv
Rollup of 8 pull requests - Successful merges: #43074, #43145, #43159, #43202, #43222, #43228, #43229, #43240 - Failed merges:
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs index d4d3365dc01..ccd4b91a7b7 100644 --- a/src/libstd/sys_common/mod.rs +++ b/src/libstd/sys_common/mod.rs @@ -52,7 +52,8 @@ pub mod net; #[cfg(feature = "backtrace")] #[cfg(any(all(unix, not(any(target_os = "macos", target_os = "ios", target_os = "emscripten"))), - all(windows, target_env = "gnu")))] + all(windows, target_env = "gnu"), + target_os = "redox"))] pub mod gnu; // common error constructors |