From d7dca087ba8a9377b7b42d2b23e4cd0bc950b4c1 Mon Sep 17 00:00:00 2001 From: Danny Holman Date: Tue, 9 Mar 2021 12:59:45 -0600 Subject: Makefile: fix wrong -I directive to compiler Fix a bug in which the architecture specific include directories are not properly included in the main Makefile. Signed-off-by: Danny Holman --- Makefile | 3 +-- arch/i386/make.config | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fdf693c..b1847bc 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,7 @@ ARCHDIR=arch/i386 include $(ARCHDIR)/make.config -INCLUDE:=$(INCLUDE) $(KERNEL_ARCH_INCLUDE) -CFLAGS:=$(CFLAGS) $(KERNEL_ARCH_CFLAGS) -I$(INCLUDE) +CFLAGS:=$(CFLAGS) $(KERNEL_ARCH_CFLAGS) LDFLAGS:=$(LDFLAGS) $(KERNEL_ARCH_LDFLAGS) LIBS:=$(LIBS) $(KERNEL_ARCH_LIBS) diff --git a/arch/i386/make.config b/arch/i386/make.config index 3add948..1f09aea 100644 --- a/arch/i386/make.config +++ b/arch/i386/make.config @@ -1,7 +1,7 @@ -KERNEL_ARCH_CFLAGS= +KERNEL_ARCH_INCLUDE=$(ARCHDIR)/include +KERNEL_ARCH_CFLAGS=-I$(KERNEL_ARCH_INCLUDE) KERNEL_ARCH_LDFLAGS= KERNEL_ARCH_LIBS= -KERNEL_ARCH_INCLUDE=$(ARCHDIR)/include KERNEL_ARCH_OBJS=$(ARCHDIR)/boot/boot.o \ $(ARCHDIR)/boot/tty.o \ -- cgit v1.2.3