aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTianhao Wang <shrik3@mailbox.org>2024-06-10 20:58:56 +0200
committerTianhao Wang <shrik3@mailbox.org>2024-06-11 15:17:14 +0200
commitf7dfc26865c586003d30bab578277e9776b98994 (patch)
treeb39909e877bc8e7c5fe38c055e1be3a5d61d67cf
parent13e3eca8ac3f6bd8c7a8fddde8b1937757e358ee (diff)
fix asm object build commands
Signed-off-by: Tianhao Wang <shrik3@mailbox.org>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
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