diff --git a/os/Makefile b/os/Makefile index 39d08000..f1813146 100644 --- a/os/Makefile +++ b/os/Makefile @@ -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 ]