Replace cargo-xbuild with build-std

crawfxrd · jackpot51 · commit 84ca337064c1 · 2020-07-13T13:51:55.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,6 +22,7 @@ redox_uefi = "0.1.0"
 redox_uefi_std = "0.1.0"
 spin = "0.5"
 #x86 = "0.7"
+rlibc = "1.0"
 
 [features]
 default = []
@@ -32,7 +33,3 @@ orbclient = { path = "orbclient" }
 redox_uefi = { path = "uefi" }
 redox_uefi_alloc = { path = "uefi_alloc" }
 redox_uefi_std = { path = "uefi_std" }
-
-[package.metadata.cargo-xbuild]
-memcpy = true
-sysroot_path = "build/xbuild"
diff --git a/Makefile b/Makefile
@@ -71,7 +71,8 @@ $(BUILD)/boot.o: $(BUILD)/boot.a
 
 $(BUILD)/boot.a: Cargo.lock Cargo.toml res/* src/* src/*/*
 	mkdir -p $(BUILD)
-	cargo xrustc \
+	cargo rustc \
+		-Z build-std=core,alloc \
 		--lib \
 		--target $(TARGET) \
 		--release \
diff --git a/src/lib.rs b/src/lib.rs
@@ -19,6 +19,7 @@ extern crate plain;
 extern crate spin;
 #[macro_use]
 extern crate uefi_std as std;
+extern crate rlibc;
 
 #[allow(unused_imports)]
 #[prelude_import]
