Fix autobuild

git-svn-id: svn://kolibrios.org@8693 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
turbocat 2021-04-27 17:40:25 +00:00
parent 1503fa58d8
commit 03de567b2b
3 changed files with 3 additions and 6 deletions

View File

@ -706,7 +706,7 @@ if tup.getconfig('NO_GCC') ~= 'full' then
tup.append_table(img_files, { tup.append_table(img_files, {
{"GAMES/REVERSI", PROGS .. "/games/reversi/trunk/reversi"}, {"GAMES/REVERSI", PROGS .. "/games/reversi/trunk/reversi"},
{"SHELL", PROGS .. "/system/shell/shell"}, {"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, { tup.append_table(extra_files, {
-- {"kolibrios/3D/cubeline", PROGS .. "/demos/cubeline/trunk/cubeline"}, -- {"kolibrios/3D/cubeline", PROGS .. "/demos/cubeline/trunk/cubeline"},

View File

@ -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 CFLAGS = -c -nostdinc -I../include -DGNUC -D_KOLIBRI_LIBC_OBJ -Os -fno-common -fno-builtin -fno-leading-underscore -fno-pie
SRC=libc.c SRC=libc.c
LIB=libc.obj LIB=../lib/libc.obj
all: all:
$(MAKE) -C ../linuxtools/src $(MAKE) -C ../linuxtools/src

View File

@ -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({"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")