Skip to content
Snippets Groups Projects
Commit f6d0ed8f authored by Stefan Lankes's avatar Stefan Lankes
Browse files

allow the parallel usage of the features pci and newlib

However, in case of newlib the network should not initialize because
newlib has its own network stack.
parent 8802a3fc
No related branches found
No related tags found
No related merge requests found
......@@ -24,9 +24,6 @@
)]
#![cfg_attr(all(target_os = "none", test), no_main)]
#[cfg(all(feature = "newlib", feature = "pci"))]
compile_error!("feature \"newlib\" and feature \"pci\" cannot be enabled at the same time");
// EXTERNAL CRATES
#[macro_use]
extern crate alloc;
......@@ -262,7 +259,7 @@ extern "C" fn initd(_arg: usize) {
// Initialize Drivers
#[cfg(not(feature = "newlib"))]
arch::init_drivers();
#[cfg(feature = "tcp")]
#[cfg(all(feature = "tcp", not(feature = "newlib")))]
crate::net::init();
syscalls::init();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment