From c951cdb59d067285c3a400b453711bec7c4a115b Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Wed, 21 Sep 2022 20:34:46 +0200 Subject: [PATCH] Fix Makefile dirty case --- Makefile | 4 ++-- README.md | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 2a6c1d4..b03459f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ default_target: vm .PHONY: vm clean -stage1/boot.bin: stage1/boot.asm +stage1/boot.bin: stage1/boot.asm stage2/target/x86-loadnothing/release/stage2 nasm -DSTAGE2SIZE=$$(du -b stage2/target/x86-loadnothing/release/stage2 | cut -f1) -f bin -o stage1/boot.bin stage1/boot.asm stage2/target/x86-loadnothing/release/stage2: stage2/src/main.rs stage2/src/vga.rs @@ -17,5 +17,5 @@ vm: nothing.img qemu-system-x86_64 -drive format=raw,file=nothing.img clean: - rm -f magic.bin stage1/boot.bin nothing.img + rm -f stage1/boot.bin nothing.img cd stage2 && cargo clean diff --git a/README.md b/README.md index 384feeb..479aa4e 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,3 @@ of your choice (but only if you've built it). It is exactly 32 MiB in size. to the wrong device.** You can then boot from the device. It should once again print "Hello Stage2!". - -# Developing -It is highly recommended to run `make clean vm`. -It takes longer to complete but is sometimes necessary -to fully apply your changes. -- 2.44.0