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

Clean up how the language libraries refer to plat headers; they should be using

Browse source 
the +pkg forms of the rules and getting the headers via the paths in descr,
rather than depending on the +headers version.
This commit is contained in:
David Given 2016-12-05 21:05:24 +01:00
parent c5aff6fc2e
commit c569ca15d8
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lang/basic/lib/build.lua
View file

@ -10,8 +10,8 @@ for _, plat in ipairs(vars.plats) do
hdrs = {}, -- must be empty hdrs = {}, -- must be empty
deps = { deps = {
"h+emheaders", "h+emheaders",
"lang/cem/libcc.ansi/headers+headers", "lang/cem/libcc.ansi/headers+pkg",
"plat/"..plat.."/include+headers", "plat/"..plat.."/include+pkg",
}, },
vars = { plat = plat } vars = { plat = plat }
} }

4
lang/cem/libcc.ansi/build.lua
View file

@ -51,8 +51,8 @@ for _, plat in ipairs(vars.plats) do
}, },
hdrs = {}, -- must be empty hdrs = {}, -- must be empty
deps = { deps = {
"lang/cem/libcc.ansi/headers+headers", "lang/cem/libcc.ansi/headers+pkg",
"plat/"..plat.."/include+headers", "plat/"..plat.."/include+pkg",
"./malloc/malloc.h", "./malloc/malloc.h",
"./math/localmath.h", "./math/localmath.h",
"./stdio/loc_incl.h", "./stdio/loc_incl.h",

4
lang/m2/libm2/build.lua
View file

@ -29,8 +29,8 @@ for _, plat in ipairs(vars.plats) do
}, },
hdrs = {}, -- must be empty hdrs = {}, -- must be empty
deps = { deps = {
"lang/cem/libcc.ansi/headers+headers", "lang/cem/libcc.ansi/headers+pkg",
"plat/"..plat.."/include+headers", "plat/"..plat.."/include+pkg",
"h+emheaders", "h+emheaders",
}, },
vars = { plat = plat } vars = { plat = plat }

4
lang/pc/libpc/build.lua
View file

@ -17,8 +17,8 @@ for _, plat in ipairs(vars.plats) do
}, },
hdrs = {}, -- must be empty hdrs = {}, -- must be empty
deps = { deps = {
"lang/cem/libcc.ansi/headers+headers", "lang/cem/libcc.ansi/headers+pkg",
"plat/"..plat.."/include+headers", "plat/"..plat.."/include+pkg",
"h+emheaders", "h+emheaders",
}, },
vars = { plat = plat } vars = { plat = plat }

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

@ -1,4 +1,4 @@
installable { installable {
name = "headers", name = "pkg",
map = { "plat/osx/include+pkg" } map = { "plat/osx/include+pkg" }
} }

2
plat/osx386/libsys/build.lua
View file

@ -27,7 +27,7 @@ acklibrary {
}, },
deps = { deps = {
"lang/cem/libcc.ansi/headers+headers", "lang/cem/libcc.ansi/headers+headers",
"plat/osx386/include+headers", "plat/osx386/include+pkg",
}, },
vars = { vars = {
plat = "osx386" plat = "osx386"

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

@ -1,4 +1,4 @@
installable { installable {
name = "headers", name = "pkg",
map = { "plat/osx/include+pkg" } map = { "plat/osx/include+pkg" }
} }

2
plat/osxppc/libsys/build.lua
View file

@ -27,7 +27,7 @@ acklibrary {
}, },
deps = { deps = {
"lang/cem/libcc.ansi/headers+headers", "lang/cem/libcc.ansi/headers+headers",
"plat/osxppc/include+headers", "plat/osxppc/include+pkg",
}, },
vars = { vars = {
plat = "osxppc" plat = "osxppc"