Commit b3c522d5 authored by Marvin Scholz's avatar Marvin Scholz Committed by Jean-Baptiste Kempf

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.
parent 9f77d9c3
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment