From 24c8144e91a76f61a8dbf5f51d773cf886e1dccf Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Mon, 6 Nov 2023 22:44:18 +0100 Subject: [PATCH] meson: luajit: Set correct LUAJIT_TARGET for buildvm On native builds this is derived automatically, but on cross builds it needs to be set explicitly. --- subprojects/packagefiles/luajit/meson.build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/subprojects/packagefiles/luajit/meson.build b/subprojects/packagefiles/luajit/meson.build index 174199f89..e27a933fe 100644 --- a/subprojects/packagefiles/luajit/meson.build +++ b/subprojects/packagefiles/luajit/meson.build @@ -7,6 +7,10 @@ system_deps = [ cc.find_library('m', required: false) ] +# get architecture id for the host machine so it can be set when compiling buildvm natively +lj_target_id = cc.get_define('LUAJIT_TARGET', prefix: '#include "@0@/src/lj_arch.h"'.format(meson.current_source_dir())) +add_project_arguments('-DLUAJIT_TARGET=@0@'.format(lj_target_id), language: 'c', native: true) + # compat flag is needed for both the buildvm code generator (compiled natively) and luajit itself add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', '-DENDIAN_LE', language: 'c', native: true) add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', '-DENDIAN_LE', language: 'c', native: false)