Move stdio defs to stdio.h, and fix an x86 makefile bug.

[polintos/scott/priv.git] / kernel / arch / x86 / Makefile.final

diff --git a/kernel/arch/x86/Makefile.final b/kernel/arch/x86/Makefile.final
index 2a4988d3a617f78c47c4d2177802fe85dc69dbb1..090c11d9ba638bda89810275de418ad54d5340a7 100644 (file)
--- a/kernel/arch/x86/Makefile.final
+++ b/kernel/arch/x86/Makefile.final
@@ -1,10 +1,9 @@
 DIR := arch/x86/
-CXXFLAGS += -fno-omit-frame-pointer -march=i686
 
-$(BUILDDIR)/kernel: $(OBJS) $(DIR)linker-script
+$(BUILDDIR)/kernel: $(OBJS) $(LIBS) $(DIR)linker-script
        @echo $(COMP): Linking kernel: $@
        @$(MKDIR) $(dir $@)
-       @$(CXX) $(OBJS) -lgcc -lsupc++ -nostdlib -o "$@" -Wl,-T$(DIR)linker-script
+       @$(CXX) $(OBJS) $(LIBS) -lgcc -lsupc++ -nostdlib -o "$@" -Wl,-T$(DIR)linker-script
 
 # GRUB refuses to use the addresses in the multiboot header if it
 # finds a valid ELF header, so the dd hacks a zero into the high byte