diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2020-10-04 14:42:39 -0700 |
|---|---|---|
| committer | Josh Triplett <josh@joshtriplett.org> | 2020-10-04 14:42:39 -0700 |
| commit | c4b0d5efd3a3cb17ae830b83bc2abc7ce83be24d (patch) | |
| tree | 172bc6ca72f598c7b206e92cc543462f87712228 /src/lib.rs | |
| parent | e3312f5a5ccb6e37f08a60ccc32a7e1cad02eeac (diff) | |
| download | rust-libc-c4b0d5efd3a3cb17ae830b83bc2abc7ce83be24d.tar.gz | |
Fix bootstrap on redox
Avoid attempting to enable the static_nobundle feature twice, which
results in rustc error E0636.
Diffstat (limited to 'src/lib.rs')
| -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] |