diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-10-05 11:21:09 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-05 11:21:09 +0900 |
| commit | 02fe5de20b9d24db107932985aa3b4dc11fe408c (patch) | |
| tree | bbb85ca5a96b485e7461362afeaf954d66771022 | |
| parent | 458f49c8e653344f7392afe9a15b1512d1d76148 (diff) | |
| parent | c4b0d5efd3a3cb17ae830b83bc2abc7ce83be24d (diff) | |
| download | rust-libc-02fe5de20b9d24db107932985aa3b4dc11fe408c.tar.gz | |
Merge pull request #1911 from joshtriplett/master
Fix bootstrap on redox
| -rw-r--r-- | src/lib.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib.rs b/src/lib.rs index 421631711c..7184e239e4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -19,7 +19,7 @@ // Attributes needed when building as part of the standard library #![cfg_attr( feature = "rustc-dep-of-std", - feature(cfg_target_vendor, link_cfg, no_core, static_nobundle) + feature(cfg_target_vendor, link_cfg, no_core) )] #![cfg_attr(libc_thread_local, feature(thread_local))] // Enable extra lints: @@ -27,7 +27,10 @@ #![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))] +#![cfg_attr( + any(feature = "rustc-dep-of-std", target_os = "redox"), + feature(static_nobundle) +)] #![cfg_attr(libc_const_extern_fn, feature(const_extern_fn))] #[macro_use] |