metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Move build-std flags to cargo config

This commit is contained in:
Berkus Decker 2020-11-08 03:34:44 +02:00
parent aac05a8776
commit bfba78118f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cargo/config.toml
View File

@ -1,3 +1,5 @@
[unstable]
build-std = ["core", "compiler_builtins", "alloc"]
[build] [build]
# https://internals.rust-lang.org/t/evaluating-pipelined-rustc-compilation/10199/12 # https://internals.rust-lang.org/t/evaluating-pipelined-rustc-compilation/10199/12
pipelining = true pipelining = true

2
Makefile.toml
View File

@ -36,8 +36,6 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
TARGET_JSON = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/${TARGET}.json" TARGET_JSON = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/${TARGET}.json"
BUILD_STD = "-Zbuild-std=core,compiler_builtins,alloc"
DEVICE_FEATURES = "noserial" DEVICE_FEATURES = "noserial"
QEMU_FEATURES = "qemu" QEMU_FEATURES = "qemu"

8
nucleus/Makefile.toml
View File

@ -5,11 +5,11 @@
# #
[tasks.build] [tasks.build]
env = { "TARGET_FEATURES" = "" } 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] [tasks.test]
env = { "TARGET_FEATURES" = "${QEMU_FEATURES}" } 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) # These tasks are written in cargo-make's own script to make it portable across platforms (no `basename` on Windows)
[tasks.kernel-binary] [tasks.kernel-binary]
@ -44,7 +44,7 @@ script = [
[tasks.build-qemu] [tasks.build-qemu]
env = { "TARGET_FEATURES" = "${QEMU_FEATURES}" } env = { "TARGET_FEATURES" = "${QEMU_FEATURES}" }
command = "cargo" command = "cargo"
args = ["build", "${BUILD_STD}", "--target=${TARGET_JSON}", "--release", "--features=${TARGET_FEATURES}"] args = ["build", "--target=${TARGET_JSON}", "--release", "--features=${TARGET_FEATURES}"]
[tasks.qemu] [tasks.qemu]
dependencies = ["build-qemu", "kernel-binary"] dependencies = ["build-qemu", "kernel-binary"]
@ -104,7 +104,7 @@ script = [
[tasks.clippy] [tasks.clippy]
env = { "TARGET_FEATURES" = { value = "--features=${CLIPPY_FEATURES}", condition = { env_set = ["CLIPPY_FEATURES"] } } } env = { "TARGET_FEATURES" = { value = "--features=${CLIPPY_FEATURES}", condition = { env_set = ["CLIPPY_FEATURES"] } } }
command = "cargo" 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] [tasks.hopper]
dependencies = ["build", "kernel-binary"] dependencies = ["build", "kernel-binary"]