From bfba78118f4580b980532bd76368f59985326fad Mon Sep 17 00:00:00 2001
From: Berkus Decker <berkus+github@metta.systems>
Date: Sun, 8 Nov 2020 03:34:44 +0200
Subject: [PATCH] Move build-std flags to cargo config

---
 .cargo/config.toml    | 2 ++
 Makefile.toml         | 2 --
 nucleus/Makefile.toml | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index b7f1846..1ccc48b 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,3 +1,5 @@
+[unstable]
+build-std = ["core", "compiler_builtins", "alloc"]
 [build]
 # https://internals.rust-lang.org/t/evaluating-pipelined-rustc-compilation/10199/12
 pipelining = true
diff --git a/Makefile.toml b/Makefile.toml
index 2c793d2..b9804df 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -36,8 +36,6 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 
 TARGET_JSON = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/${TARGET}.json"
 
-BUILD_STD = "-Zbuild-std=core,compiler_builtins,alloc"
-
 DEVICE_FEATURES = "noserial"
 QEMU_FEATURES = "qemu"
 
diff --git a/nucleus/Makefile.toml b/nucleus/Makefile.toml
index 95cfa7e..9246985 100644
--- a/nucleus/Makefile.toml
+++ b/nucleus/Makefile.toml
@@ -5,11 +5,11 @@
 #
 [tasks.build]
 env = { "TARGET_FEATURES" = "" }
-args = ["build", "${BUILD_STD}", "--target=${TARGET_JSON}", "--release", "--features=${TARGET_FEATURES}"]
+args = ["build", "--target=${TARGET_JSON}", "--release", "--features=${TARGET_FEATURES}"]
 
 [tasks.test]
 env = { "TARGET_FEATURES" = "${QEMU_FEATURES}" }
-args = ["test", "${BUILD_STD}", "--target=${TARGET_JSON}", "--features=${TARGET_FEATURES}"]
+args = ["test", "--target=${TARGET_JSON}", "--features=${TARGET_FEATURES}"]
 
 # These tasks are written in cargo-make's own script to make it portable across platforms (no `basename` on Windows)
 [tasks.kernel-binary]
@@ -44,7 +44,7 @@ script = [
 [tasks.build-qemu]
 env = { "TARGET_FEATURES" = "${QEMU_FEATURES}" }
 command = "cargo"
-args = ["build", "${BUILD_STD}", "--target=${TARGET_JSON}", "--release", "--features=${TARGET_FEATURES}"]
+args = ["build", "--target=${TARGET_JSON}", "--release", "--features=${TARGET_FEATURES}"]
 
 [tasks.qemu]
 dependencies = ["build-qemu", "kernel-binary"]
@@ -104,7 +104,7 @@ script = [
 [tasks.clippy]
 env = { "TARGET_FEATURES" = { value = "--features=${CLIPPY_FEATURES}", condition = { env_set = ["CLIPPY_FEATURES"] } } }
 command = "cargo"
-args = ["clippy", "${BUILD_STD}", "--target=${TARGET_JSON}", "@@remove-empty(TARGET_FEATURES)", "--", "-D", "warnings"]
+args = ["clippy", "--target=${TARGET_JSON}", "@@remove-empty(TARGET_FEATURES)", "--", "-D", "warnings"]
 
 [tasks.hopper]
 dependencies = ["build", "kernel-binary"]