From 3c99665491b5c1a824ee8e48b22f2c63a2b595d6 Mon Sep 17 00:00:00 2001
From: Matthias Kruk <m@m10k.eu>
Date: Tue, 4 Feb 2020 20:31:53 +0900
Subject: [PATCH] Make sure klibc is the last element in OBJECTS

---
 kernel/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/Makefile b/kernel/Makefile
index 642a6ce..e14ae2c 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,8 +1,9 @@
-OBJECTS = arch/arch.o core/core.o vga/vga.o kbd/kbd.o klibc/klibc.a sched/sched.o
+OBJECTS = arch/arch.o core/core.o vga/vga.o kbd/kbd.o sched/sched.o
+OBJECTS += klibc/klibc.a # klibc needs to be last
 DEPS = arch core vga kbd klibc sched
 LDFLAGS = --oformat=elf32-i386 -b elf32-i386 -m elf_i386
 CFLAGS = -m32 -Wall -nostdlib -nodefaultlibs -nostartfiles -ffreestanding
-LIBGCC = /usr/lib/gcc-cross/i686-linux-gnu/8/libgcc.a
+LIBGCC = /usr/lib/gcc/i686-linux-gnu/8/libgcc.a
 PHONY = $(DEPS) clean
 OUTPUT = corax
 
-- 
2.47.3