All the Linux include directories are the same, so common them all out into a

single one, like OSX.
This commit is contained in:
David Given 2018-06-24 19:57:43 +02:00
parent 47bdd9cc49
commit ab7002c0ee
10 changed files with 35 additions and 78 deletions

View file

@ -0,0 +1,26 @@
include("plat/build.lua")
headermap = {}
packagemap = {}
local function addheader(h)
headermap[h] = "plat/linux/include/"..h
packagemap["$(PLATIND)/linux/include/"..h] = "plat/linux/include/"..h
end
addheader("ack/plat.h")
addheader("ack/fcntl.h")
addheader("ack/signal.h")
addheader("sys/ioctl.h")
addheader("sys/types.h")
acklibrary {
name = "headers",
hdrs = headermap
}
installable {
name = "pkg",
map = packagemap
}

View file

@ -31,7 +31,7 @@ var EGO_PLAT_FLAGS=-M{EM}/share/ack/ego/{ARCH}.descr
# Override the setting in fe so that files compiled for linux386 can see
# the platform-specific headers.
var C_INCLUDES=-I{PLATFORMDIR}/include -I{EM}/share/ack/include/ansi
var C_INCLUDES=-I{EM}/share/ack/linux/include -I{EM}/share/ack/include/ansi
name be
from .m.g

View file

@ -1,26 +1,4 @@
include("plat/build.lua")
headermap = {}
packagemap = {}
local function addheader(h)
headermap[h] = "plat/linux/include/"..h
packagemap["$(PLATIND)/linux386/include/"..h] = "plat/linux/include/"..h
end
addheader("ack/plat.h")
addheader("ack/fcntl.h")
addheader("ack/signal.h")
addheader("sys/ioctl.h")
addheader("sys/types.h")
acklibrary {
name = "headers",
hdrs = headermap
}
installable {
name = "pkg",
map = packagemap
map = { "plat/linux/include+pkg" }
}

View file

@ -8,7 +8,7 @@ acklibrary {
deps = {
"plat/linux/libsys/*.h",
"lang/cem/libcc.ansi/headers+headers",
"plat/linux386/include+headers",
"plat/linux386/include+pkg",
},
vars = {
plat = "linux386"

View file

@ -31,7 +31,7 @@ var EGO_PLAT_FLAGS=-M{EM}/share/ack/ego/{ARCH}.descr
# Override the setting in fe so that files compiled for linux68k can see
# the platform-specific headers.
var C_INCLUDES=-I{PLATFORMDIR}/include -I{EM}/share/ack/include/ansi
var C_INCLUDES=-I{EM}/share/ack/linux/include -I{EM}/share/ack/include/ansi
name be
from .m.g

View file

@ -1,27 +1,4 @@
include("plat/build.lua")
headermap = {}
packagemap = {}
local function addheader(h)
headermap[h] = "plat/linux/include/"..h
packagemap["$(PLATIND)/linux68k/include/"..h] = "plat/linux/include/"..h
end
addheader("ack/plat.h")
addheader("ack/fcntl.h")
addheader("ack/signal.h")
addheader("sys/ioctl.h")
addheader("sys/types.h")
acklibrary {
name = "headers",
hdrs = headermap
}
installable {
name = "pkg",
map = packagemap
map = { "plat/linux/include+pkg" }
}

View file

@ -8,7 +8,7 @@ acklibrary {
deps = {
"plat/linux/libsys/*.h",
"lang/cem/libcc.ansi/headers+headers",
"plat/linux68k/include+headers",
"plat/linux68k/include+pkg",
},
vars = {
plat = "linux68k"

View file

@ -25,7 +25,7 @@ var EGO_PLAT_FLAGS=-M{EM}/share/ack/ego/{ARCH}.descr
# Override the setting in fe so that files compiled for linuxppc can see
# the platform-specific headers.
var C_INCLUDES=-I{PLATFORMDIR}/include -I{EM}/share/ack/include/ansi
var C_INCLUDES=-I{EM}/share/ack/linux/include -I{EM}/share/ack/include/ansi
name be
from .m.g

View file

@ -1,28 +1,4 @@
include("plat/build.lua")
headermap = {}
packagemap = {}
local function addheader(h)
headermap[h] = "plat/linux/include/"..h
packagemap["$(PLATIND)/linuxppc/include/"..h] = "plat/linux/include/"..h
end
addheader("ack/plat.h")
addheader("ack/fcntl.h")
addheader("ack/signal.h")
addheader("sys/ioctl.h")
addheader("sys/types.h")
acklibrary {
name = "headers",
hdrs = headermap
}
installable {
name = "pkg",
map = packagemap
map = { "plat/linux/include+pkg" }
}

View file

@ -26,7 +26,7 @@ acklibrary {
deps = {
"plat/linux/libsys/*.h",
"lang/cem/libcc.ansi/headers+headers",
"plat/linuxppc/include+headers",
"plat/linuxppc/include+pkg",
},
vars = {
plat = "linuxppc"