From 9fa85f2b2730af904b8003ca3a7d4018961fec5e Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Sun, 26 May 2024 10:04:00 -0600
Subject: [PATCH] Remove use of build-std, build-std-features

x86_64-unknown-uefi is a tier 2 supported target [1] that provides core
and alloc (with redox_uefi providing the allocator). Nightly compiler
options for building them are not needed.

[1]: https://doc.rust-lang.org/1.78.0/rustc/platform-support/unknown-uefi.html

Signed-off-by: Tim Crawford <tcrawford@system76.com>
---
 Makefile            | 2 --
 rust-toolchain.toml | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 2ace51e..8de0153 100644
--- a/Makefile
+++ b/Makefile
@@ -42,8 +42,6 @@ $(BUILD)/efi.img: $(BUILD)/boot.efi
 $(BUILD)/boot.efi: Cargo.lock Cargo.toml res/* src/* src/*/*
 	mkdir -p $(BUILD)
 	cargo rustc \
-		-Z build-std=core,alloc \
-		-Z build-std-features=compiler-builtins-mem \
 		--target $(TARGET) \
 		--release \
 		-- \
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 87f6fe7..4660956 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,4 @@
 [toolchain]
 channel = "nightly-2023-01-21"
-components = ["rust-src"]
+targets = ["x86_64-unknown-uefi"]
+profile = "minimal"