Commit Diff

Commit:
f7e75ee1534165bb6c9833ada674f1ba8a70b960
From:
Aleksey Ryndin <continue@to.any-key.press>
Date:
Message:
Fix build of assembler files
Actions:
Patch | Tree
commit - 621c3fa7e60bd46123980e938e3e9342b6ab4f3b
commit + f7e75ee1534165bb6c9833ada674f1ba8a70b960
blob - 349071597c6fca19429942fb86deeb6f1892a6f6
blob + b18eaf83bcdaaff2cec1409888c81b226761be3b
--- Makefile
+++ Makefile
@@ -7,10 +7,8 @@ ARCH		= aarch64
 TARGET		= ${ARCH}-none-elf
 BOARD		= virt
 
--include	config.mk
-
 ASFLAGS		= -target ${TARGET}
-ASFILES		= boot.o
+ASFILES		= boot.S
 
 CXXFLAGS	= -target ${TARGET}
 CXXFLAGS        +=-Wall -Wextra -Werror
@@ -21,6 +19,8 @@ CXXFILES	= kernel.cc uart_${BOARD}.cc
 
 OBJS		= ${ASFILES:.S=.o} ${CXXFILES:.cc=.o}
 
+-include	config.mk
+
 .PHONY:	clean qemu gdb-remote
 
 all: squat.img
@@ -32,7 +32,7 @@ squat.elf: linker.ld ${OBJS}
 	${LD} -T linker.ld -o squat.elf ${OBJS}
 
 .S.o:
-	${AS} ${ASFLAGS} -c boot.S -o boot.o
+	${AS} ${ASFLAGS} -c $< -o $@
 
 clean:
 	rm -rf *.o squat.elf squat.img