Skip to content

Commit 5408b10

Browse files
committed
Auto merge of #1332 - redox-os:redox-unix, r=gnzlbg
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
2 parents 4ac8346 + eb75c48 commit 5408b10

File tree

7 files changed

+604
-549
lines changed

7 files changed

+604
-549
lines changed

src/lib.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#![deny(missing_copy_implementations, safe_packed_borrows)]
2727
#![no_std]
2828
#![cfg_attr(feature = "rustc-dep-of-std", no_core)]
29+
#![cfg_attr(target_os = "redox", feature(static_nobundle))]
2930

3031
#[macro_use]
3132
mod macros;
@@ -91,9 +92,6 @@ cfg_if! {
9192
if #[cfg(windows)] {
9293
mod windows;
9394
pub use windows::*;
94-
} else if #[cfg(target_os = "redox")] {
95-
mod redox;
96-
pub use redox::*;
9795
} else if #[cfg(target_os = "cloudabi")] {
9896
mod cloudabi;
9997
pub use cloudabi::*;

src/redox/align.rs

-6
This file was deleted.

0 commit comments

Comments
 (0)