From 5ec58ab828c04aacae5632a18ccf052314ced848 Mon Sep 17 00:00:00 2001 From: turbocat Date: Tue, 9 Mar 2021 11:05:29 +0000 Subject: [PATCH] kolibri-libc: - Fixed build libc.obj git-svn-id: svn://kolibrios.org@8642 a494cfbc-eb01-0410-851d-a64ba20cac60 --- contrib/kolibri-libc/source/Makefile | 9 ++------- contrib/kolibri-libc/source/Makefile.shared | 8 +++++++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/contrib/kolibri-libc/source/Makefile b/contrib/kolibri-libc/source/Makefile index f7d5917c60..e2bf640059 100644 --- a/contrib/kolibri-libc/source/Makefile +++ b/contrib/kolibri-libc/source/Makefile @@ -28,7 +28,7 @@ RM = rm -rf MKDIR_P = mkdir -p endif -all: mk_export $(cfiles) $(asmfiles) $(LIB_DIR) $(LIBC.A) +all: $(cfiles) $(asmfiles) $(LIB_DIR) $(LIBC.A) fasm crt/crt0.asm $(LIB_DIR)/crt0.o $(LIBC.A): $(cfiles) $(asmfiles) @@ -43,18 +43,13 @@ $(asmfiles): $(RM) $*.sx clean: - $(RM) $(cfiles) $(asmfiles) + $(RM) $(cfiles) $(asmfiles) exports/exports.c $(RM) $(LIBNAME) -mk_export: - $(MKEXP) ../loader/symbols.txt exports/exports.c - - shared: $(cfiles) $(asmfiles) $(CLINK) $^ $(KPACK) a.out.obj mv a.out.obj $(LIBC.OBJ) - test: make -C ../test -f Makefile.tcc diff --git a/contrib/kolibri-libc/source/Makefile.shared b/contrib/kolibri-libc/source/Makefile.shared index 0722ceed82..188d215705 100644 --- a/contrib/kolibri-libc/source/Makefile.shared +++ b/contrib/kolibri-libc/source/Makefile.shared @@ -1,3 +1,9 @@ +MKEXP=../linuxtools/mkexp + all: $(MAKE) clean - env CC=i686-w64-mingw32-gcc CPP=i686-w64-mingw32-cpp AS=i686-w64-mingw32-as $(MAKE) shared \ No newline at end of file + $(MKEXP) ../loader/symbols.txt exports/exports.c + env CC=i686-w64-mingw32-gcc CPP=i686-w64-mingw32-cpp AS=i686-w64-mingw32-as $(MAKE) shared + +install: + cp ../lib/libc.obj ~/.kex/root/RD/1/LIB