Make bootloader buildable with -Zbuild-std

phil-opp · phil-opp · commit 874fe6ec5a00 · 2020-07-16T13:43:07.000+02:00
Requires the latest bootimage version to parse the `package.metadata.bootloader.build-std` key.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,6 +18,7 @@ x86_64 = { version = "0.11.0", optional = true }
 usize_conversions = { version = "0.2.0", optional = true }
 fixedvec = { version = "0.2.4", optional = true }
 bit_field = { version = "0.10.0", optional = true }
+rlibc = "1.0.0"
 
 [dependencies.font8x8]
 version = "0.2.4"
@@ -47,6 +48,7 @@ debug = true
 
 [package.metadata.bootloader]
 target = "x86_64-bootloader.json"
+build-std = "core"
 
 [package.metadata.docs.rs]
 features = [ "recursive_page_table", "map_physical_memory" ]
diff --git a/src/main.rs b/src/main.rs
@@ -7,6 +7,8 @@
 #[cfg(not(target_os = "none"))]
 compile_error!("The bootloader crate must be compiled for the `x86_64-bootloader.json` target");
 
+extern crate rlibc;
+
 use bootloader::bootinfo::{BootInfo, FrameRange};
 use core::convert::TryInto;
 use core::panic::PanicInfo;
