diff options
| author | Miquel Sabaté Solà <mikisabate@gmail.com> | 2024-11-20 11:49:58 +0100 |
|---|---|---|
| committer | Miquel Sabaté Solà <mikisabate@gmail.com> | 2024-11-20 11:49:58 +0100 |
| commit | 0c94897441ef6ba6665746519036aeb9d1d570ec (patch) | |
| tree | 99573641a6b13d081752cca2f416b0e5c2801aa0 | |
| parent | fb9627cc985912a57de8b4bedc98991e290e4075 (diff) | |
| download | fbos-0c94897441ef6ba6665746519036aeb9d1d570ec.tar.gz fbos-0c94897441ef6ba6665746519036aeb9d1d570ec.zip | |
Ensure the environment is clean on QEMU launch
Since the library code can now be exchanged between tests and the actual
kernel, there might be a missmatch when launching QEMU after calling
`make all`. Ensure that this cannot happen by calling `clean` on the
`qemu` target.
Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -81,11 +81,11 @@ $(KRNL): $(OBJ) $(LINKER).S .c.o: $(E) " CC " $(basename $@) - $(Q) $(CC) $(CCFLAGS) $(KRNLFLAGS) -c $< -o $@ + $(Q) $(CC) $(CCFLAGS) -c $< -o $@ .S.o: $(E) " CC " $(basename $@) - $(Q) $(CC) $(CCFLAGS) -D__ASSEMBLY__ -D__KERNEL__ -c $< -o $@ + $(Q) $(CC) $(CCFLAGS) -D__ASSEMBLY__ -c $< -o $@ ## # User space @@ -97,7 +97,7 @@ usr: $(USR) usr/src/%.o: usr/src/%.S $(E) " CC " $(basename $@) - $(Q) $(CC) $(ASFLAGS) -D__ASSEMBLY__ -D__KERNEL__ -c $< -o $@ + $(Q) $(CC) $(ASFLAGS) -D__ASSEMBLY__ -c $< -o $@ usr/bin/%: usr/src/%.o $(Q) mkdir -p usr/bin/ @@ -129,7 +129,7 @@ test/%: test/%.o # Hacking .PHONY: qemu -qemu: $(KRNL) usr +qemu: clean $(KRNL) usr ifeq ($(strip $(QEMU_BIOS)),) $(Q) $(QEMU) $(QEMU_FLAGS) -machine virt -kernel $(KRNL) -initrd $(INIT) else |