diff --git a/Makefile b/Makefile index 72fcf11..7a2b287 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,5 @@ export CCPREFIX = i686-elf- -export AR = $(CCPREFIX)ar -export AS = $(CCPREFIX)as -export CC = $(CCPREFIX)gcc - run: run-iso all: all-kernel all-iso all-libk diff --git a/arch/Makefile b/arch/Makefile index 13eeb76..2530699 100644 --- a/arch/Makefile +++ b/arch/Makefile @@ -1,3 +1,6 @@ +AS = $(CCPREFIX)as +CC = $(CCPREFIX)gcc + OBJS = start.s.o OBJS += init.c.o OBJS += main.c.o diff --git a/libk/Makefile b/libk/Makefile index dc67c06..570c662 100644 --- a/libk/Makefile +++ b/libk/Makefile @@ -1,3 +1,6 @@ +AR = $(CCPREFIX)ar +CC = $(CCPREFIX)gcc + CFLAGS = -std=gnu99 -ffreestanding -nostdinc -fno-builtin -fno-stack-protector -Wall -Wextra OUTPUT = libk.a