This repository was archived by the owner on Feb 13, 2024. It is now read-only.
File tree 1 file changed +5
-5
lines changed 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ FAT_IMG := $(BUILD_DIR)/fat.img
27
27
INITRD := $(BUILD_DIR ) /initrd.img
28
28
29
29
LD := ld
30
- RUSTCC := cargo
30
+ RUSTC := cargo
31
31
RM := rm -rf
32
32
VIEWER := qemu-system-x86_64
33
33
@@ -90,14 +90,14 @@ $(LIB_FILE): $(RUST_SRC) $(COMMON_SRC) $(COMMON_SRC_DIR)/$(CARGO_TOML) $(KERNEL_
90
90
# FIXME: Currently `cargo` tries to read `$(pwd)/.cargo/config.toml`, not
91
91
# `$(dirname argument_of_--manifest-path)/.cargo/config.toml`.
92
92
# See: https://github.com/rust-lang/cargo/issues/2930
93
- cd $(KERNEL_DIR ) && $(RUSTCC ) build --out-dir ../$(BUILD_DIR ) -Z unstable-options $(TEST_FLAG ) $(RUSTCFLAGS )
93
+ cd $(KERNEL_DIR ) && $(RUSTC ) build --out-dir ../$(BUILD_DIR ) -Z unstable-options $(TEST_FLAG ) $(RUSTCFLAGS )
94
94
95
95
% .fd :
96
96
@echo " $@ not found"
97
97
exit 1
98
98
99
99
$(EFI_FILE ) :$(EFI_SRC ) $(COMMON_SRC ) $(COMMON_SRC_DIR ) /$(CARGO_TOML ) $(EFI_DIR ) /$(CARGO_TOML ) |$(BUILD_DIR )
100
- cd $(EFI_DIR ) && $(RUSTCC ) build --out-dir=../$(BUILD_DIR ) -Z unstable-options $(RUSTCFLAGS )
100
+ cd $(EFI_DIR ) && $(RUSTC ) build --out-dir=../$(BUILD_DIR ) -Z unstable-options $(RUSTCFLAGS )
101
101
102
102
$(INITRD ) :|$(BUILD_DIR )
103
103
tar cf $@ $(BUILD_DIR )
@@ -110,5 +110,5 @@ clippy:
110
110
111
111
clean :
112
112
$(RM ) build
113
- $(RUSTCC ) clean --manifest-path=$(KERNEL_DIR ) /Cargo.toml
114
- $(RUSTCC ) clean --manifest-path=$(EFI_DIR ) /Cargo.toml
113
+ $(RUSTC ) clean --manifest-path=$(KERNEL_DIR ) /Cargo.toml
114
+ $(RUSTC ) clean --manifest-path=$(EFI_DIR ) /Cargo.toml
You can’t perform that action at this time.
0 commit comments