From 039df4c04d83fc26ca60d4f870d2e58d381818ad Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Wed, 3 Feb 2021 23:39:03 +0200
Subject: Rewrite boot.s to use clang instead of nasm

---
 makefile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index b149337..9c2728c 100644
--- a/makefile
+++ b/makefile
@@ -6,12 +6,11 @@
 export TARGET := i686-elf
 
 export AR := llvm-ar
-export NASM := nasm
+export AS := clang
 export LD := ld.lld
-export CXX := clang++
-export CXX_FLAGS := -std=c++20 -ffreestanding \
-    -nostdlib -nostdinc -nostdinc++ \
-    -fno-exceptions -fno-rtti -Wall -Wextra -O2
+export CXX := clang
+export CXX_FLAGS := -std=c++20 -ffreestanding -nostdlib -nostdinc -nostdinc++ \
+		    -fno-exceptions -fno-rtti -Wall -Wextra -O2
 CXX_INCLUDE := $(CURDIR)/libk
 CXX_OBJ := kernel.o vga.o
 
@@ -25,10 +24,10 @@ check-grub: glitch.elf
 	grub-file --is-x86-multiboot2 glitch.elf
 
 glitch.elf: boot.o $(CXX_OBJ) libk/libk.a
-	$(LD) -T linker.ld -o glitch.elf boot.o $(CXX_OBJ) -Llibk -lk
+	$(LD) -T linker.ld -o glitch.elf boot.o $(CXX_OBJ) -lk
 
-boot.o: boot.asm
-	$(NASM) -felf32 -o $@ $^
+boot.o: boot.s
+	$(AS) -target $(TARGET) -nostdlib -Wall -Wextra -c $^ -o $@
 
 $(CXX_OBJ): %.o : %.cc
 	$(CXX) -target $(TARGET) $(CXX_FLAGS) -I$(CXX_INCLUDE) -c $^ -o $@
-- 
cgit v1.2.1