From bf2aa9ab99d21c2a65fe2e03faf954afa8082d02 Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Tue, 16 Feb 2021 07:48:40 +0000 Subject: [PATCH] build: Link against libatomic on x86 when using Clang Needed for 64-bit atomics on 32-bit architectures on Clang. Signed-off-by: Joshua Ashton --- meson.build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meson.build b/meson.build index ba04c792..3eb05e2f 100644 --- a/meson.build +++ b/meson.build @@ -6,6 +6,7 @@ cpu_family = target_machine.cpu_family() vkd3d_compiler = meson.get_compiler('c') vkd3d_msvc = vkd3d_compiler.get_id() == 'msvc' +vkd3d_clang = vkd3d_compiler.get_id() == 'clang' vkd3d_c_std = 'c11' vkd3d_platform = target_machine.system() @@ -101,6 +102,13 @@ if cpu_family == 'x86' '-Wl,--add-stdcall-alias', '-Wl,--enable-stdcall-fixup']), language : [ 'c', 'cpp' ]) + + # Need to link against libatomic for 64-bit atomic emulation on x86 + # when using clang. + if vkd3d_clang + lib_atomic = vkd3d_compiler.find_library('atomic') + vkd3d_extra_libs += lib_atomic + endif endif vkd3d_build = vcs_tag(