summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 07343b1..e7c5182 100644
--- a/Makefile
+++ b/Makefile
@@ -6,15 +6,13 @@ ARCH = x86
ARCH_BOOT = arch/$(ARCH)/boot
BOOTBIN = $(ARCH_BOOT)/bootloader.bin
-TARGET_TOOLS = $(HOME)/path/to/cross/compiler/i686-elf-
-CC = $(TARGET_TOOLS)gcc
-export CC
-LD = $(TARGET_TOOLS)ld
-export LD
-AS = $(TARGET_TOOLS)as
-export AS
-OBJDUMP = $(TARGET_TOOLS)objdump
-export OBJDUMP
+TARGET = i686-elf
+TARGET_TOOLS = $(PWD)/tools/toolchain/bin/$(TARGET)-
+
+CC = $(TARGET_TOOLS)gcc
+LD = $(TARGET_TOOLS)ld
+AS = $(TARGET_TOOLS)as
+OBJDUMP = $(TARGET_TOOLS)objdump
C_SOURCES = \
kernel/main.c \
@@ -22,6 +20,8 @@ C_SOURCES = \
drivers/video/console/vgacon.c
OBJECTS = ${C_SOURCES:.c=.o}
+export CC LD AS OBJDUMP
+
.PHONY: all qemu objdump-boot objdump-kernel clean
all: $(OSBIN)