diff options
| author | Danny Holman <dholman@gymli.xyz> | 2021-03-09 12:59:45 -0600 |
|---|---|---|
| committer | Danny Holman <dholman@gymli.xyz> | 2021-03-09 12:59:45 -0600 |
| commit | d7dca087ba8a9377b7b42d2b23e4cd0bc950b4c1 (patch) | |
| tree | 296b095c3290b4a1e93915dd9cedcfa581db548b | |
| parent | 9e9c555ead1d7dbc509f5538a7bd2747ca6cadfa (diff) | |
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 <dholman@gymli.xyz>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | arch/i386/make.config | 4 |
2 files changed, 3 insertions, 4 deletions
@@ -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 \ |