diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-04 15:46:51 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-05 12:37:49 +0530 |
| commit | bedfca0fb323e040ca63d0db5d45b8071529aef9 (patch) | |
| tree | c356e1fac18b6757ea48b37081b16d040c40c8e5 /src | |
| parent | 24f00eb2aef34210067e76afe8e7d7786bfbed6f (diff) | |
| parent | 9893b44ad9a9c3a23067a083ed0e0a08c2e83886 (diff) | |
| download | rust-bedfca0fb323e040ca63d0db5d45b8071529aef9.tar.gz rust-bedfca0fb323e040ca63d0db5d45b8071529aef9.zip | |
Rollup merge of #23004 - alexcrichton:libc-stable, r=brson
This same source is being built in the Cargo ecosystem and hence needs to build on stable Rust as well. This commit places the `no_std` attribute along with the `no_std` feature behind a `cfg_attr` flag so they are not processed when compiled on crates.io
Diffstat (limited to 'src')
| -rw-r--r-- | src/liblibc/lib.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index 42143b06ca0..d650f935566 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -10,13 +10,10 @@ #![crate_name = "libc"] #![crate_type = "rlib"] -#![cfg_attr(not(feature = "cargo-build"), - unstable(feature = "libc"))] -#![cfg_attr(not(feature = "cargo-build"), feature(staged_api))] +#![cfg_attr(not(feature = "cargo-build"), unstable(feature = "libc"))] +#![cfg_attr(not(feature = "cargo-build"), feature(staged_api, core, no_std))] #![cfg_attr(not(feature = "cargo-build"), staged_api)] -#![cfg_attr(not(feature = "cargo-build"), feature(core))] -#![feature(no_std)] -#![no_std] +#![cfg_attr(not(feature = "cargo-build"), no_std)] #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://doc.rust-lang.org/nightly/", |