From 115a749f0bd122cda5a85d5b8d054e4d0edcfb62 Mon Sep 17 00:00:00 2001 From: Alexander M Pickering Date: Thu, 12 Sep 2024 13:15:17 -0500 Subject: More work on luajit --- init-nix | 3 ++- meta.lua | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/init-nix b/init-nix index afdf99d..d7010dc 100755 --- a/init-nix +++ b/init-nix @@ -4,5 +4,6 @@ rc-service networking start apk add build-base cd luajit/src -echo "lua4win" > luajit_relver.txt make host/minilua host/buildvm +cp host/minilua /root +cp host/buildvm /root diff --git a/meta.lua b/meta.lua index 1b74bf6..ef27b95 100644 --- a/meta.lua +++ b/meta.lua @@ -20,8 +20,8 @@ builds["luajit-meta"] = { {"git","luajit"} }, produces = { - ["luajit/src/host/minilua"] = true, - ["luajit/src/host/buildvm"] = true + ["minilua"] = true, + ["buildvm"] = true }, entrypoint="init-nix" } @@ -33,8 +33,8 @@ for name, optimization, rel, flag, _, image in cartesian(optimizations, debug, c requires = { {"git","luajit"}, {"cicd", "image-" .. image}, - {"cicd", "luajit-base:luajit/src/host/minilua"}, - {"cicd", "luajit-base:luajit/src/host/buildvm"}, + {"cicd", "luajit-base:minilua"}, + {"cicd", "luajit-base:buildvm"}, }, produces = { ["lua.exe"] = true, -- cgit v1.2.3-55-g6feb