From b3c522d5c060b98bdd6a164df95c891cd7f6b985 Mon Sep 17 00:00:00 2001 From: Marvin Scholz Date: Mon, 19 Nov 2018 17:10:04 +0100 Subject: build: Only add libdav1d_nasm_objs if needed Current versions of meson have a bug that causes the need to add the nasm generated objects to checkasm, even though this should already be covered by the extract_all_objects() for libdav1d. Meson versions >= 0.48.999 (that is, Meson 0.49 and development versions states of that on git) fixed this issue so now adding this is not longer needed. Adding it regardless would actually cause an error because of symbols being present twice. --- tests/meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index 23ba4ed..5398ba2 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -67,10 +67,15 @@ if is_asm_enabled m_lib = cc.find_library('m', required: false) + libdav1d_nasm_objs_if_needed = [] + if meson.version().version_compare('< 0.48.999') + libdav1d_nasm_objs_if_needed = libdav1d_nasm_objs + endif + checkasm = executable('checkasm', checkasm_sources, checkasm_nasm_objs, - libdav1d_nasm_objs, + libdav1d_nasm_objs_if_needed, objects: [ checkasm_bitdepth_objs, -- cgit v1.2.3