Finally fix the build system issue where ackprogram would try to explicitly
link all the language libraries.
This commit is contained in:
parent
953c08839f
commit
2d0bc7ef0d
|
@ -62,11 +62,23 @@ definerule("ackprogram",
|
||||||
deps = { type="targets", default={} },
|
deps = { type="targets", default={} },
|
||||||
},
|
},
|
||||||
function (e)
|
function (e)
|
||||||
|
-- This bit is a hack. We *don't* want to link the language libraries here,
|
||||||
|
-- because the ack driver is going to pick the appropriate library itself and
|
||||||
|
-- we don't want more than one. But we still need to depend on them, so we use
|
||||||
|
-- a nasty hack.
|
||||||
|
|
||||||
|
local platstamp = normalrule {
|
||||||
|
name = e.name.."/platstamp",
|
||||||
|
ins = { "plat/"..e.vars.plat.."+pkg" },
|
||||||
|
outleaves = { "stamp" },
|
||||||
|
commands = { "touch %{outs}" }
|
||||||
|
}
|
||||||
|
|
||||||
return cprogram {
|
return cprogram {
|
||||||
name = e.name,
|
name = e.name,
|
||||||
srcs = e.srcs,
|
srcs = e.srcs,
|
||||||
deps = {
|
deps = {
|
||||||
"plat/"..e.vars.plat.."+pkg",
|
platstamp,
|
||||||
"util/ack+pkg",
|
"util/ack+pkg",
|
||||||
"util/led+pkg",
|
"util/led+pkg",
|
||||||
e.deps
|
e.deps
|
||||||
|
|
Loading…
Reference in a new issue