d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Install only 1 copy, not 2 copies, of osx headers.

Browse source 
Before this commit, the headers in plat/osx/include got installed
twice into PLATIND/osx386/include and PLATIND/osxppc/include.  This
commit installs them once into PLATIND/osx/include and changes both
descr files to find them.

Several rules in lang/ depend on plat/osx386/include+headers or
plat/osxppc/include+headers.  They each become a simplerule that
depends on plat/osx/include+headers.
This commit is contained in:
George Koehler 2016-11-08 17:13:51 -05:00
parent ed7fb69f79
commit 0d0495e818
7 changed files with 38 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
plat/osx/include/build.lua Normal file
View file

@ -0,0 +1,24 @@
include("plat/build.lua")
headermap = {}
packagemap = {}
local function addheader(h)
headermap[h] = "plat/osx/include/"..h
packagemap["$(PLATIND)/osx/include/"..h] = "plat/osx/include/"..h
end
addheader("ack/config.h")
addheader("sys/mman.h")
addheader("sys/types.h")
addheader("unistd.h")
acklibrary {
name = "headers",
hdrs = headermap
}
installable {
name = "pkg",
map = packagemap
}

2
plat/osx386/build-pkg.lua
View file

@ -17,7 +17,7 @@ installable {
map = { map = {
"+tools", "+tools",
"+libs", "+libs",
"./include+pkg", "plat/osx/include+pkg",
["$(PLATIND)/osx386/boot.o"] = "+boot", ["$(PLATIND)/osx386/boot.o"] = "+boot",
["$(PLATIND)/osx386/libsys.a"] = "./libsys+lib", ["$(PLATIND)/osx386/libsys.a"] = "./libsys+lib",
} }

2
plat/osx386/descr
View file

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

27
plat/osx386/include/build.lua
View file

@ -1,24 +1,7 @@
include("plat/build.lua") simplerule {
headermap = {}
packagemap = {}
local function addheader(h)
headermap[h] = "plat/osx/include/"..h
packagemap["$(PLATIND)/osx386/include/"..h] = "plat/osx/include/"..h
end
addheader("ack/config.h")
addheader("sys/mman.h")
addheader("sys/types.h")
addheader("unistd.h")
acklibrary {
name = "headers", name = "headers",
hdrs = headermap deps = { "plat/osx/include+headers" },
} ins = {},
outs = {},
installable { commands = {},
name = "pkg",
map = packagemap
} }

2
plat/osxppc/build-pkg.lua
View file

@ -17,7 +17,7 @@ installable {
map = { map = {
"+tools", "+tools",
"+libs", "+libs",
"./include+pkg", "plat/osx/include+pkg",
["$(PLATIND)/osxppc/boot.o"] = "+boot", ["$(PLATIND)/osxppc/boot.o"] = "+boot",
["$(PLATIND)/osxppc/libsys.a"] = "./libsys+lib", ["$(PLATIND)/osxppc/libsys.a"] = "./libsys+lib",
} }

2
plat/osxppc/descr
View file

@ -30,7 +30,7 @@ var MACHOPT_F=-m10
# Override the setting in fe so that files compiled for osxppc can see # Override the setting in fe so that files compiled for osxppc can see
# the platform-specific headers. # the platform-specific headers.
var C_INCLUDES=-I{PLATFORMDIR}/include -I{EM}/share/ack/include/ansi var C_INCLUDES=-I{EM}/share/ack/osx/include -I{EM}/share/ack/include/ansi
name be name be
from .m.g from .m.g

27
plat/osxppc/include/build.lua
View file

@ -1,24 +1,7 @@
include("plat/build.lua") simplerule {
headermap = {}
packagemap = {}
local function addheader(h)
headermap[h] = "plat/osx/include/"..h
packagemap["$(PLATIND)/osxppc/include/"..h] = "plat/osx/include/"..h
end
addheader("ack/config.h")
addheader("sys/mman.h")
addheader("sys/types.h")
addheader("unistd.h")
acklibrary {
name = "headers", name = "headers",
hdrs = headermap deps = { "plat/osx/include+headers" },
} ins = {},
outs = {},
installable { commands = {},
name = "pkg",
map = packagemap
} }