From f7dfc26865c586003d30bab578277e9776b98994 Mon Sep 17 00:00:00 2001 From: Tianhao Wang Date: Mon, 10 Jun 2024 20:58:56 +0200 Subject: fix asm object build commands Signed-off-by: Tianhao Wang --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9ddf9b2..ae1b14c 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ $(BUILD)/kernel : rust_kernel startup.o $(ASMOBJ_PREFIXED) $(BUILD)/_%.o : %.s | $(BUILD) @echo "---ASM $@" @if test \( ! \( -d $(@D) \) \) ;then mkdir -p $(@D);fi - $(VERBOSE) $(ASM) $(ASMFLAGS) -o $@ $< + $(VERBOSE) nasm $(NASMFLAGS) -o $@ $< # Compile the rust part: note that the the cargo crate is of type [staticlib], # if you don't define this, the linker will have troubles, especially when we -- cgit v1.2.3-70-g09d2