From 783f7354a4639d15702857265d4720ace81886d1 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sun, 17 Mar 2019 13:56:10 -0600
Subject: [PATCH] Fix build of bootloader-efi

---
 mk/disk.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mk/disk.mk b/mk/disk.mk
index 715f20f..979d522 100644
--- a/mk/disk.mk
+++ b/mk/disk.mk
@@ -22,12 +22,17 @@ bootloader-coreboot/build/bootloader: build/kernel_coreboot
 	$(MAKE) -C bootloader-coreboot clean build/bootloader KERNEL="$(ROOT)/$<"
 
 build/coreboot.elf: bootloader-coreboot/build/bootloader
+	mkdir -p build
 	cp -v $< $@
 
 bootloader-efi/build/$(EFI_TARGET)/boot.efi: FORCE
-	$(MAKE) -C bootloader-efi build/$(EFI_TARGET)/boot.efi TARGET=$(EFI_TARGET)
+	unset XARGO_HOME XARGO_RUST_SRC && \
+	cd bootloader-efi && \
+	rustup component add rust-src && \
+	$(MAKE) build/$(EFI_TARGET)/boot.efi TARGET=$(EFI_TARGET)
 
 build/bootloader.efi: bootloader-efi/build/$(EFI_TARGET)/boot.efi
+	mkdir -p build
 	cp -v $< $@
 
 build/harddrive-efi.bin: build/bootloader.efi build/filesystem.bin