all: Export {C,LD,AS}FLAGS

This makes applying custom compiler/linker/assembler flags actually work.

diff --git a/Makefile b/Makefile
index 4e5ae9a65c26722f0f19a1114b59e8c48ccb5789..cc923070db4ab2271cf64205407ea297284157b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,9 @@ export CC = gcc
 export QEMU = qemu-system-i386 -monitor stdio
 export GIT_REV = $(shell git describe --long HEAD)
 export REAL_CC = $(CROSS_COMPILE)$(CC)
+export CFLAGS
+export LDFLAGS
+export ASFLAGS
 MAKEFLAGS += -rR
 
 default: kernel/kernel.elf bootloader

diff --git a/boot/x86/Makefile b/boot/x86/Makefile
index 3d12d12cdd6c07799b3920de893e3bd476643c5e..89891a8a8f4b2ef4e55c750a68111cd66a8c73af 100644 (file)
--- a/boot/x86/Makefile
+++ b/boot/x86/Makefile
@@ -14,6 +14,6 @@ clean:
 
 # Implicit rules
 %: %.s
-       $(AS) $(ASFLAGS_BASE) -f bin $< -o $@
+       $(AS) $(ASFLAGS_BASE) $(ASFLAGS) -f bin $< -o $@
 
 .PHONY : default clean stage3