Skip to content

Commit

Permalink
Auto merge of #1332 - redox-os:redox-unix, r=gnzlbg
Browse files Browse the repository at this point in the history
redox: convert to target_family unix

This is the first step to supporting rust-lang/rust#60139.

In order to have a smooth transition, there will need to be a change made in rust at the same time, switching Redox over to the unix target family. See rust-lang/rust#60547
  • Loading branch information
bors committed May 10, 2019
2 parents 39ca01c + eb75c48 commit 1d01758
Show file tree
Hide file tree
Showing 7 changed files with 604 additions and 549 deletions.
4 changes: 1 addition & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#![deny(missing_copy_implementations, safe_packed_borrows)]
#![no_std]
#![cfg_attr(feature = "rustc-dep-of-std", no_core)]
#![cfg_attr(target_os = "redox", feature(static_nobundle))]

#[macro_use]
mod macros;
Expand Down Expand Up @@ -91,9 +92,6 @@ cfg_if! {
if #[cfg(windows)] {
mod windows;
pub use windows::*;
} else if #[cfg(target_os = "redox")] {
mod redox;
pub use redox::*;
} else if #[cfg(target_os = "cloudabi")] {
mod cloudabi;
pub use cloudabi::*;
Expand Down
6 changes: 0 additions & 6 deletions src/redox/align.rs

This file was deleted.

Loading

0 comments on commit 1d01758

Please sign in to comment.