diff --git a/meson.build b/meson.build index 43e6eb53..0ace360e 100644 --- a/meson.build +++ b/meson.build @@ -38,6 +38,8 @@ endif if host_machine.system() == 'darwin' lite_link_args += ['-framework', 'CoreServices', '-framework', 'Foundation'] + # the linker aguments below are needed by luajit on macOS + lite_link_args += ['-pagezero_size', '10000', '-image_base', '100000000'] endif #=============================================================================== # Dependencies @@ -46,7 +48,7 @@ if not get_option('source-only') libm = cc.find_library('m', required : false) libdl = cc.find_library('dl', required : false) threads_dep = dependency('threads') - lua_dep = dependency('luajit', fallback: ['luajit', 'luajit_dep'], + lua_dep = dependency('luajit', fallback: ['luajit', 'lua_dep'], default_options: ['default_library=static'] ) pcre2_dep = dependency('libpcre2-8') diff --git a/subprojects/luajit.wrap b/subprojects/luajit.wrap index eed1c170..8701091a 100644 --- a/subprojects/luajit.wrap +++ b/subprojects/luajit.wrap @@ -1,5 +1,5 @@ [wrap-git] directory = luajit url = https://github.com/franko/luajit -revision = v2.0.5-lhelper3 +revision = v2.0.5-lhelper4