Remove cargo xbuild (#83)

* Add nanowait based on calibrated rdtsc * Add spin_loop_hint * Update dependencies * Update cargo config * Add rlibc dependency to fix compilation bug * Remove cargo xbuild * Update crates * Update readme
vinc · Jul 31, 2020 · f97191b · f97191b
1 parent 51a1b77
commit f97191b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
@@ -1,3 +1,6 @@
+[unstable]
+build-std = ["core", "compiler_builtins", "alloc"]
+
 [build]
 target = "x86_64-moros.json"
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,3 +34,4 @@ uart_16550 = "0.2.7"
 volatile = "0.2.6"
 x86_64 = "0.11.1"
 vte = "0.8.0"
+rlibc = "1.0.0"
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ setup:
 	rustup default nightly
 	rustup component add rust-src
 	rustup component add llvm-tools-preview
-	cargo install cargo-xbuild bootimage
+	cargo install bootimage
 
 output = vga
 keyboard = qwerty

diff --git a/README.md b/README.md
@@ -45,7 +45,12 @@ Install tools:
     $ rustup default nightly
     $ rustup component add rust-src
     $ rustup component add llvm-tools-preview
-    $ cargo install cargo-xbuild bootimage
+    $ cargo install bootimage
+
+Clone repo:
+
+    $ git clone https://github.com/vinc/moros
+    $ cd moros
 
 
 ## Usage

diff --git a/src/main.rs b/src/main.rs
@@ -1,6 +1,7 @@
 #![no_std]
 #![no_main]
 
+extern crate rlibc; // TODO: See https://github.com/rust-lang/wg-cargo-std-aware/issues/53
 extern crate alloc;
 
 use bootloader::{entry_point, BootInfo};