summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2017-05-17 18:00:24 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2017-05-17 18:00:24 +0200
commit5585cc355659660f29cefa0d576d2356597fede7 (patch)
tree3276c0dae2582efc4ad85c6caae977a697774257 /src/Makefile
parent07f029b4b7d3d6d8e5fb4dfc1198b6ae6880fb56 (diff)
parent63b03f5222f0ab5e9c8dc5dc63c8ed8a63884438 (diff)
downloadabaos-5585cc355659660f29cefa0d576d2356597fede7.tar.gz
abaos-5585cc355659660f29cefa0d576d2356597fede7.tar.bz2
Merge branch 'master' of ssh://git.andreasbaumann.cc:2221/abaos
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 7f5f162..1a4f71f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,7 @@
CC := gcc
CFLAGS := -std=c99 -m32 -ffreestanding -O0 -g -Wall -Werror
LD := ld
+LDFLAGS := -f elf32
all: image.bin
@@ -42,7 +43,7 @@ serial.o: serial.c serial.h
$(CC) $(CFLAGS) -c -o serial.o serial.c
port_asm.o: port.asm
- nasm port.asm -f elf32 -o port_asm.o
+ nasm port.asm $(LDFLAGS) -o port_asm.o
string.o: string.c string.h
$(CC) $(CFLAGS) -c -o string.o string.c