From c4b0d5efd3a3cb17ae830b83bc2abc7ce83be24d Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Sun, 4 Oct 2020 14:42:39 -0700
Subject: [PATCH] Fix bootstrap on redox
Avoid attempting to enable the static_nobundle feature twice, which
results in rustc error E0636.
---
src/lib.rs | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/lib.rs b/src/lib.rs
index 42163171..7184e239 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]
--
GitLab