linux386 builds. Also, forgot to turn back on the language runtimes.
This commit is contained in:
parent
262c5fedcf
commit
f253b6a169
2
Makefile
2
Makefile
|
@ -49,7 +49,7 @@ PLATIND = $(INSDIR)/share/ack
|
|||
PLATDEP = $(INSDIR)/lib/ack
|
||||
|
||||
MAKECMDGOALS ?= +ack
|
||||
BUILD_FILES = $(shell find * -name build.lua)
|
||||
BUILD_FILES = $(shell find * -name '*.lua')
|
||||
|
||||
NINJA := $(shell which ninja)
|
||||
ifneq ($(findstring +, $(MAKECMDGOALS)),)
|
||||
|
|
|
@ -5,8 +5,9 @@ vars.ackcflags = {
|
|||
"-O"
|
||||
}
|
||||
vars.plats = {
|
||||
"pc86",
|
||||
"cpm",
|
||||
"linux386",
|
||||
"pc86",
|
||||
}
|
||||
|
||||
installable {
|
||||
|
@ -17,6 +18,7 @@ installable {
|
|||
"lang/m2/comp+pkg",
|
||||
"lang/pc/comp+pkg",
|
||||
"plat/cpm+pkg",
|
||||
"plat/linux386+pkg",
|
||||
"plat/pc86+pkg",
|
||||
"util/ack+pkg",
|
||||
"util/amisc+pkg",
|
||||
|
|
8
mach/i386/libem/build.lua
Normal file
8
mach/i386/libem/build.lua
Normal file
|
@ -0,0 +1,8 @@
|
|||
for _, plat in ipairs(vars.plats) do
|
||||
acklibrary {
|
||||
name = "lib_"..plat,
|
||||
srcs = { "./*.s" },
|
||||
vars = { plat = plat },
|
||||
}
|
||||
end
|
||||
|
8
mach/i386/libend/build.lua
Normal file
8
mach/i386/libend/build.lua
Normal file
|
@ -0,0 +1,8 @@
|
|||
for _, plat in ipairs(vars.plats) do
|
||||
acklibrary {
|
||||
name = "lib_"..plat,
|
||||
srcs = { "./*.s" },
|
||||
vars = { plat = plat },
|
||||
}
|
||||
end
|
||||
|
|
@ -64,9 +64,9 @@ definerule("build_plat_libs",
|
|||
name = e.name,
|
||||
map = {
|
||||
"lang/basic/lib+pkg_"..e.plat,
|
||||
--"lang/cem/libcc.ansi+pkg_"..e.plat,
|
||||
--"lang/m2/libm2+pkg_"..e.plat,
|
||||
--"lang/pc/libpc+pkg_"..e.plat,
|
||||
"lang/cem/libcc.ansi+pkg_"..e.plat,
|
||||
"lang/m2/libm2+pkg_"..e.plat,
|
||||
"lang/pc/libpc+pkg_"..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,
|
||||
}
|
||||
|
|
11
plat/linux386/build-headers.lua
Normal file
11
plat/linux386/build-headers.lua
Normal 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",
|
||||
}
|
||||
}
|
||||
|
23
plat/linux386/build-pkg.lua
Normal file
23
plat/linux386/build-pkg.lua
Normal 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"
|
||||
}
|
||||
}
|
||||
|
21
plat/linux386/build-tools.lua
Normal file
21
plat/linux386/build-tools.lua
Normal 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",
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue