From 50cc73dd138f51935cb1a9a4a784dce794798997 Mon Sep 17 00:00:00 2001 From: Alex Kotov Date: Tue, 7 Jun 2022 07:34:58 +0300 Subject: [PATCH] Fix and upgrade code --- kernel/Makefile | 7 +++++-- memgr/Makefile | 2 +- procman/Makefile | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 7a8c859..0f64fd7 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -1,4 +1,6 @@ -CCPREFIX = /home/kotovalexarian/repos/global/tailix/libkernaux/vendor/cross/root/bin/i386-elf- +CCPREFIX = /home/kotovalexarian/repos/global/tailix/cross/root/bin/i386-elf- + +LIBFSC_PREFIX = /opt/libfsc/i386 LIBKERNAUX_PREFIX = /opt/libkernaux/i386 AS = $(CCPREFIX)as @@ -15,6 +17,7 @@ CFLAGS = \ -ffreestanding \ -fno-builtin \ -fno-stack-protector \ + -I$(LIBFSC_PREFIX)/include \ -I$(LIBKERNAUX_PREFIX)/include CPPFLAGS = \ @@ -51,7 +54,7 @@ clean: rm -f $(KERNEL) $(OBJS) $(KERNEL): $(OBJS) - $(CC) -T linker.ld -o $@ $^ -ffreestanding -nostdlib -lgcc -lkernaux -Wl,-L$(LIBKERNAUX_PREFIX)/lib + $(CC) -T linker.ld -o $@ $^ -ffreestanding -nostdlib -lkernaux -lc -lgcc -Wl,-L$(LIBFSC_PREFIX)/lib -Wl,-L$(LIBKERNAUX_PREFIX)/lib grub-file --is-x86-multiboot2 $@ %.c.o: %.c diff --git a/memgr/Makefile b/memgr/Makefile index dbc791b..005de50 100644 --- a/memgr/Makefile +++ b/memgr/Makefile @@ -1,4 +1,4 @@ -CCPREFIX = /home/kotovalexarian/repos/global/tailix/libkernaux/vendor/cross/root/bin/i386-elf- +CCPREFIX = /home/kotovalexarian/repos/global/tailix/cross/root/bin/i386-elf- AS = $(CCPREFIX)as CC = $(CCPREFIX)gcc diff --git a/procman/Makefile b/procman/Makefile index 07e6799..56cf677 100644 --- a/procman/Makefile +++ b/procman/Makefile @@ -1,4 +1,4 @@ -CCPREFIX = /home/kotovalexarian/repos/global/tailix/libkernaux/vendor/cross/root/bin/i386-elf- +CCPREFIX = /home/kotovalexarian/repos/global/tailix/cross/root/bin/i386-elf- AS = $(CCPREFIX)as CC = $(CCPREFIX)gcc