diff options
| author | Marvin Scholz <epirat07@gmail.com> | 2018-11-19 19:10:04 +0300 |
|---|---|---|
| committer | Jean-Baptiste Kempf <jb@videolan.org> | 2018-11-20 00:25:41 +0300 |
| commit | b3c522d5c060b98bdd6a164df95c891cd7f6b985 (patch) | |
| tree | 8079e1f6d5456e7667392d9746ba8931692cb0be | |
| parent | 9f77d9c3e332c169acdfe904768eebdef7c5827f (diff) | |
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.
| -rw-r--r-- | tests/meson.build | 7 |
1 files changed, 6 insertions, 1 deletions
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, |