From 07d8a22a537c9525a2f0ac4aef9a8153ae110a27 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Thu, 16 Jul 2020 15:37:09 +0200
Subject: [PATCH] Use `-Zbuildstd` instead of cargo-xbuild

---
 .cargo/config |  2 ++
 Cargo.lock    | 12 ++++++++++--
 Cargo.toml    |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.cargo/config b/.cargo/config
index 7f2ad55d..8e9ab91d 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,3 +1,5 @@
+unstable.build-std = ["core", "compiler_builtins"]
+
 [build]
 target = "x86_64-blog_os.json"
 
diff --git a/Cargo.lock b/Cargo.lock
index e98c764b..bc5bece6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9,6 +9,14 @@ dependencies = [
 
 [[package]]
 name = "bootloader"
-version = "0.9.3"
+version = "0.9.5"
+source = "git+https://github.com/rust-osdev/bootloader.git?branch=Zbuild-std#874fe6ec5a0043b515ef74591b925bb527fb3c9a"
+dependencies = [
+ "rlibc",
+]
+
+[[package]]
+name = "rlibc"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44ac0bdf4930c3c4d7f0d04eb6f15d7dcb9d5972b1ff9cd2bee0128112260fc7"
+checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe"
diff --git a/Cargo.toml b/Cargo.toml
index 28f343b0..f437d305 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,4 +5,4 @@ authors = ["Philipp Oppermann <dev@phil-opp.com>"]
 edition = "2018"
 
 [dependencies]
-bootloader = "0.9.3"
+bootloader = { git = "https://github.com/rust-osdev/bootloader.git", branch = "Zbuild-std" }