diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 382fe67afd..6b2419b6e3 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -706,7 +706,7 @@ if tup.getconfig('NO_GCC') ~= 'full' then tup.append_table(img_files, { {"GAMES/REVERSI", PROGS .. "/games/reversi/trunk/reversi"}, {"SHELL", PROGS .. "/system/shell/shell"}, - {"LIB/LIBC.OBJ", PROGS .. "/develop/libraries/kolibri-libc/lib/libc.obj"}, + {"LIB/LIBC.OBJ", PROGS .. "/develop/libraries/kolibri-libc/source/libc.obj"}, }) tup.append_table(extra_files, { -- {"kolibrios/3D/cubeline", PROGS .. "/demos/cubeline/trunk/cubeline"}, diff --git a/programs/develop/libraries/kolibri-libc/source/Makefile b/programs/develop/libraries/kolibri-libc/source/Makefile index d6a3fde598..9d89014f70 100644 --- a/programs/develop/libraries/kolibri-libc/source/Makefile +++ b/programs/develop/libraries/kolibri-libc/source/Makefile @@ -7,7 +7,7 @@ FASM=fasm CFLAGS = -c -nostdinc -I../include -DGNUC -D_KOLIBRI_LIBC_OBJ -Os -fno-common -fno-builtin -fno-leading-underscore -fno-pie SRC=libc.c -LIB=libc.obj +LIB=../lib/libc.obj all: $(MAKE) -C ../linuxtools/src diff --git a/programs/develop/libraries/kolibri-libc/source/Tupfile.lua b/programs/develop/libraries/kolibri-libc/source/Tupfile.lua index 5e8f2e3740..dbb723eb90 100755 --- a/programs/develop/libraries/kolibri-libc/source/Tupfile.lua +++ b/programs/develop/libraries/kolibri-libc/source/Tupfile.lua @@ -10,7 +10,4 @@ tup.rule("../linuxtools/src/LoaderGen.c", "gcc %f -o %o" , "../linuxtools/Loader tup.rule({"symbols.txt",extra_inputs = {"../linuxtools/ExportGen"}}, "../linuxtools/ExportGen %f %o" , "exports/exports.c") -tup.rule({"libc.c",extra_inputs = {"exports/exports.c"}} , "kos32-gcc" .. CFLAGS .. INCLUDES .. " -o %o %f " .. tup.getconfig("KPACK_CMD"), "../lib/libc.obj") - - - +tup.rule({"libc.c",extra_inputs = {"exports/exports.c"}} , "kos32-gcc" .. CFLAGS .. INCLUDES .. " -o %o %f " .. tup.getconfig("KPACK_CMD"), "libc.obj")