Module: Mesa Branch: staging/18.2-ci Commit: 639d915b83459f7c703d8e6866fdd7ea96e092b3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=639d915b83459f7c703d8e6866fdd7ea96e092b3
Author: Dylan Baker <[email protected]> Date: Fri Nov 9 12:56:00 2018 -0800 meson: fix libatomic tests There are two problems: 1) the extra underscore in MISSING_64BIT_ATOMICS 2) we should link with libatomic if the previous test decided we needed it Fixes: d1992255bb29054fa51763376d125183a9f602f3 ("meson: Add build Intel "anv" vulkan driver") Reviewed-and-Tested-by: Matt Turner <[email protected]> (cherry picked from commit 4eab98b66e7dc495f26ac3b0e356e405c0796b74) --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 5b0eea10a3..ca5538c80e 100644 --- a/meson.build +++ b/meson.build @@ -887,8 +887,9 @@ if not cc.links('''#include <stdint.h> int main() { return __sync_add_and_fetch(&v, (uint64_t)1); }''', + dependencies : dep_atomic, name : 'GCC 64bit atomics') - pre_args += '-DMISSING_64_BIT_ATOMICS' + pre_args += '-DMISSING_64BIT_ATOMICS' endif # TODO: shared/static? Is this even worth doing? _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
