linux386 builds. Also, forgot to turn back on the language runtimes.

This commit is contained in:
David Given 2016-08-14 10:37:55 +02:00
parent 262c5fedcf
commit f253b6a169
8 changed files with 78 additions and 5 deletions

View file

@ -49,7 +49,7 @@ PLATIND = $(INSDIR)/share/ack
PLATDEP = $(INSDIR)/lib/ack PLATDEP = $(INSDIR)/lib/ack
MAKECMDGOALS ?= +ack MAKECMDGOALS ?= +ack
BUILD_FILES = $(shell find * -name build.lua) BUILD_FILES = $(shell find * -name '*.lua')
NINJA := $(shell which ninja) NINJA := $(shell which ninja)
ifneq ($(findstring +, $(MAKECMDGOALS)),) ifneq ($(findstring +, $(MAKECMDGOALS)),)

View file

@ -5,8 +5,9 @@ vars.ackcflags = {
"-O" "-O"
} }
vars.plats = { vars.plats = {
"pc86",
"cpm", "cpm",
"linux386",
"pc86",
} }
installable { installable {
@ -17,6 +18,7 @@ installable {
"lang/m2/comp+pkg", "lang/m2/comp+pkg",
"lang/pc/comp+pkg", "lang/pc/comp+pkg",
"plat/cpm+pkg", "plat/cpm+pkg",
"plat/linux386+pkg",
"plat/pc86+pkg", "plat/pc86+pkg",
"util/ack+pkg", "util/ack+pkg",
"util/amisc+pkg", "util/amisc+pkg",

View file

@ -0,0 +1,8 @@
for _, plat in ipairs(vars.plats) do
acklibrary {
name = "lib_"..plat,
srcs = { "./*.s" },
vars = { plat = plat },
}
end

View file

@ -0,0 +1,8 @@
for _, plat in ipairs(vars.plats) do
acklibrary {
name = "lib_"..plat,
srcs = { "./*.s" },
vars = { plat = plat },
}
end

View file

@ -64,9 +64,9 @@ definerule("build_plat_libs",
name = e.name, name = e.name,
map = { map = {
"lang/basic/lib+pkg_"..e.plat, "lang/basic/lib+pkg_"..e.plat,
--"lang/cem/libcc.ansi+pkg_"..e.plat, "lang/cem/libcc.ansi+pkg_"..e.plat,
--"lang/m2/libm2+pkg_"..e.plat, "lang/m2/libm2+pkg_"..e.plat,
--"lang/pc/libpc+pkg_"..e.plat, "lang/pc/libpc+pkg_"..e.plat,
["$(PLATIND)/"..e.plat.."/libem.a"] = "mach/"..e.arch.."/libem+lib_"..e.plat, ["$(PLATIND)/"..e.plat.."/libem.a"] = "mach/"..e.arch.."/libem+lib_"..e.plat,
["$(PLATIND)/"..e.plat.."/libend.a"] = "mach/"..e.arch.."/libend+lib_"..e.plat, ["$(PLATIND)/"..e.plat.."/libend.a"] = "mach/"..e.arch.."/libend+lib_"..e.plat,
} }

View file

@ -0,0 +1,11 @@
include("plat/build.lua")
acklibrary {
name = "headers",
hdrs = {
["ack/config.h"] = "./include/ack/config.h",
["sys/ioctl.h"] = "./include/sys/ioctl.h",
["unistd.h"] = "./include/unistd.h",
}
}

View file

@ -0,0 +1,23 @@
include("plat/build.lua")
ackfile {
name = "boot",
srcs = { "./boot.s" },
vars = { plat = "linux386" }
}
build_plat_libs {
name = "libs",
arch = "i386",
plat = "linux386",
}
installable {
name = "pkg",
map = {
"+tools",
"+libs",
["$(PLATIND)/linux386/boot.o"] = "+boot"
}
}

View file

@ -0,0 +1,21 @@
include("plat/build.lua")
build_as {
name = "as",
arch = "i386",
}
build_ncg {
name = "ncg",
arch = "i386",
}
return installable {
name = "tools",
map = {
["$(PLATDEP)/linux386/as"] = "+as",
["$(PLATDEP)/linux386/ncg"] = "+ncg",
["$(PLATIND)/descr/linux386"] = "./descr",
"util/opt+pkg",
}
}