From 2c927bac320233817fc6290ee1f5e2eaf598c486 Mon Sep 17 00:00:00 2001 From: Myaamori Date: Sun, 23 May 2021 22:33:27 +0100 Subject: [PATCH] meson: make --force-fallback-for=luajit work This option makes the dependency() call resolve to the subproject which breaks the Lua 5.2 compatibility check. This change just ignores the result of the dependency() call if it resolves to the subproject and then re-fetches it with a subproject() call later. Alternatively we could explicitly handle the case where dependency() resolves to the subproject, but that's just extra code for no observable difference in behaviour. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index cd03a4f27..8f4bac08e 100644 --- a/meson.build +++ b/meson.build @@ -251,7 +251,7 @@ conf_platform = configuration_data() conf_platform.set('DEFAULT_PLAYER_AUDIO', def_audio) luajit = dependency('luajit', version: '>=2.0.0', required: get_option('system_luajit')) -if luajit.found() +if luajit.found() and luajit.type_name() != 'internal' luajit_test = cc.run('''#include int main(void) {