Skip to content

Commit 64e36dd

Browse files
authored
Merge pull request #125 from rust-osdev/Zbuild-std
Make bootloader buildable with `-Zbuild-std`
2 parents b263840 + 874fe6e commit 64e36dd

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

Diff for: Cargo.lock

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ x86_64 = { version = "0.11.0", optional = true }
1818
usize_conversions = { version = "0.2.0", optional = true }
1919
fixedvec = { version = "0.2.4", optional = true }
2020
bit_field = { version = "0.10.0", optional = true }
21+
rlibc = "1.0.0"
2122

2223
[dependencies.font8x8]
2324
version = "0.2.4"
@@ -47,6 +48,7 @@ debug = true
4748

4849
[package.metadata.bootloader]
4950
target = "x86_64-bootloader.json"
51+
build-std = "core"
5052

5153
[package.metadata.docs.rs]
5254
features = [ "recursive_page_table", "map_physical_memory" ]

Diff for: src/main.rs

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
#[cfg(not(target_os = "none"))]
88
compile_error!("The bootloader crate must be compiled for the `x86_64-bootloader.json` target");
99

10+
extern crate rlibc;
11+
1012
use bootloader::bootinfo::{BootInfo, FrameRange};
1113
use core::convert::TryInto;
1214
use core::panic::PanicInfo;

0 commit comments

Comments
 (0)