From 4c61dfcf518b5c51de1d777aea9dd89be7e907e6 Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Sun, 17 Feb 2019 12:22:30 -0500 Subject: [PATCH] meson: fix luajit compiler args --- subprojects/luajit/meson.build | 15 ++++++--------- subprojects/luajit/src/host/meson.build | 4 ++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/subprojects/luajit/meson.build b/subprojects/luajit/meson.build index 38b2f9743..2a838bd18 100644 --- a/subprojects/luajit/meson.build +++ b/subprojects/luajit/meson.build @@ -7,25 +7,22 @@ system_deps = [ cc.find_library('m', required: false) ] -system_deps_native = [ - cc.find_library('dl', required: false, native: true), - cc.find_library('m', required: false, native: true) -] - add_project_arguments('-DLUAJIT_ENABLE_LUA52COMPAT', language: 'c') if host_machine.system() == 'linux' - add_project_arguments('-DLUAJIT_USE_LINUX', language: 'c') + add_project_arguments('-DLUAJIT_OS=LUAJIT_OS_LINUX', language: 'c') readline_dep = cc.find_library('readline') ljvm_mode = 'elfasm' ljvm_bout = 'lj_vm.s' elif host_machine.system() == 'darwin' - add_project_arguments(['-DLUAJIT_USE_MACOSX'], language: 'c') + add_project_arguments(['-DLUAJIT_OS=LUAJIT_OS_OSX'], language: 'c') readline_dep = cc.find_library('readline') ljvm_mode = 'machasm' ljvm_bout = 'lj_vm.s' elif host_machine.system() == 'windows' - add_project_arguments('-DLUAJIT_USE_WINDOWS', '-DWIN', - '-malign-double', language: 'c') + add_project_arguments('-DLUAJIT_OS=LUAJIT_OS_WINDOWS', language: 'c') + if cc.get_id() != 'msvc' + add_project_arguments('-malign-double', language: 'c') + endif readline_dep = [] ljvm_mode = 'peobj' ljvm_bout = 'lj_vm.o' diff --git a/subprojects/luajit/src/host/meson.build b/subprojects/luajit/src/host/meson.build index eca091c46..d6ae5c943 100644 --- a/subprojects/luajit/src/host/meson.build +++ b/subprojects/luajit/src/host/meson.build @@ -1,5 +1,5 @@ minilua = executable('minilua', 'minilua.c', - dependencies: system_deps_native, + dependencies: system_deps, native: true) if host_machine.cpu_family() == 'x86_64' @@ -45,6 +45,6 @@ buildvm_arch = custom_target('buildvm_arch.h', output: 'buildvm_arch.h') buildvm = executable('buildvm', buildvm_src, buildvm_arch, - dependencies: system_deps_native, + dependencies: system_deps, include_directories: src_inc, native: true)