Merge branch 'main' into cc_rebase

QuarkContainer · Jun 11, 2024 · 7b7972e · 7b7972e
2 parents 6c216e7 + 2f6247a
commit 7b7972e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/qkernel/.cargo/config.toml b/qkernel/.cargo/config.toml
@@ -0,0 +1,3 @@
+[unstable]
+build-std = ["core","alloc", "compiler_builtins"]
+build-std-features = ["compiler-builtins-mem"]
diff --git a/qkernel/makefile b/qkernel/makefile
@@ -39,15 +39,15 @@ $(cc_kernel_debug): cc_kernel_debug $(assembly_object_files)
 		$(assembly_object_files) $(qkernel_debug)
 
 kernel:
-	CARGO_TARGET_DIR=../target cargo +$(TOOLCHAIN) xbuild --target $(arch)-qkernel.json --release
+	CARGO_TARGET_DIR=../target cargo +$(TOOLCHAIN) build --target $(arch)-qkernel.json --release
 
 kernel_debug:
-	CARGO_TARGET_DIR=../target cargo +$(TOOLCHAIN) xbuild --target $(arch)-qkernel.json
+	CARGO_TARGET_DIR=../target cargo +$(TOOLCHAIN) build --target $(arch)-qkernel.json
 cc_kernel:
-	CARGO_TARGET_DIR=../target cargo +$(TOOLCHAIN) xbuild --target $(arch)-qkernel.json --release --features cc
+	CARGO_TARGET_DIR=../target cargo +$(TOOLCHAIN) build --target $(arch)-qkernel.json --release --features cc
 
 cc_kernel_debug:
-	CARGO_TARGET_DIR=../target cargo +$(TOOLCHAIN) xbuild --target $(arch)-qkernel.json --features cc
+	CARGO_TARGET_DIR=../target cargo +$(TOOLCHAIN) build --target $(arch)-qkernel.json --features cc
 
 ../build/arch/$(arch)/%.o: src/qlib/kernel/arch/$(arch)/%.s
 	@mkdir -p $(shell dirname $@)