Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small Fix.

Browse source
This commit is contained in:
Yifan Wu 2021-02-08 11:32:47 +08:00
parent f091c12f65
commit 00b7e3be94
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
os/Makefile
View file

@ -35,17 +35,10 @@ DISASM ?= -x
build: env $(KERNEL_BIN) $(FS_IMG)
env:
<<<<<<< HEAD
(rustup component list | grep "rust-src") || rustup component add rust-src
(rustup component list | grep "llvm-tools-preview") || rustup component add llvm-tools-preview
(which rust-objdump) || cargo install cargo-binutils
(rustup target list | grep "riscv64gc-unknown-none-elf") || rustup target add riscv64gc-unknown-none-elf
=======
(rustup target list | grep "riscv64gc-unknown-none-elf (installed)") || rustup target add $(TARGET)
cargo install cargo-binutils
rustup component add rust-src
rustup component add llvm-tools-preview
>>>>>>> dev
sdcard: $(FS_IMG)
@echo "Are you sure write to $(SDCARD) ? [y/N] " && read ans && [ $${ans:-N} = y ]