From 2d0bc7ef0d9ede851b409d7c958a4edfc60c671d Mon Sep 17 00:00:00 2001 From: David Given Date: Sun, 20 Nov 2016 18:57:44 +0100 Subject: [PATCH] Finally fix the build system issue where ackprogram would try to explicitly link all the language libraries. --- plat/build.lua | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/plat/build.lua b/plat/build.lua index a6774b920..85ba61bc9 100644 --- a/plat/build.lua +++ b/plat/build.lua @@ -62,11 +62,23 @@ definerule("ackprogram", deps = { type="targets", default={} }, }, 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 { name = e.name, srcs = e.srcs, deps = { - "plat/"..e.vars.plat.."+pkg", + platstamp, "util/ack+pkg", "util/led+pkg", e.deps -- 2.34.1