From bda7418e1e39b524d75b31d8870f20e2c936179f Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Mon, 13 Jul 2020 12:34:02 -0600
Subject: [PATCH] Replace cargo-xbuild with build-std

---
 Cargo.lock | 7 +++++++
 Cargo.toml | 5 +----
 Makefile   | 3 ++-
 src/lib.rs | 1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fd00875..2f45878 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -112,6 +112,11 @@ dependencies = [
  "redox_uefi_alloc 0.1.0",
 ]
 
+[[package]]
+name = "rlibc"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -174,6 +179,7 @@ dependencies = [
  "redox_hwio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_uefi 0.1.0",
  "redox_uefi_std 0.1.2",
+ "rlibc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -191,6 +197,7 @@ dependencies = [
 "checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 "checksum redox_dmi 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4f00f61bcf7b6946ecd3e65f5871fb6b689680e59513eaa9a4d020bb73aa7fb7"
 "checksum redox_hwio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c5c3085fd5054b1f2ad35668f7c60031e6a7cb05d82477f936ac700d24d4477"
+"checksum rlibc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum rusttype 0.7.5 (git+https://gitlab.redox-os.org/redox-os/rusttype.git?branch=no_std)" = "<none>"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
diff --git a/Cargo.toml b/Cargo.toml
index 55d5b09..93e4a9c 100644
--- 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
index 4c4bb45..4765139 100644
--- 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
index 29e68a2..077e1d2 100644
--- 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]