Meson: More cleanups to the atomics module

diff --git a/meson.build b/meson.build
index fc7d96726d6689c5711b89b662f9f15111dcd9b2..d45ba24933c82c11a8f89c02f8133691d18444b4 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -184,7 +184,7 @@ subdir('ext')
 deps = [
   dep_pdns,
   dep_platform,
-  dep_atomic,
+  dep_atomics,
   dep_lua,
   dep_lua_records,
   dep_gss_tsig,

diff --git a/meson/atomics/meson.build b/meson/atomics/meson.build
index 6a4138b8c202af3b76a94ec580f0c93bb7023999..47bf92ef88fde64c19d47b9f7e99084c394d669c 100644 (file)
--- a/meson/atomics/meson.build
+++ b/meson/atomics/meson.build
@@ -1,4 +1,4 @@
-dep_atomic = declare_dependency()
+dep_atomics = dependency('', required: false)
 need_latomic = false
 
 prog = fs.read('atomic_add_fetch.cc')
@@ -7,7 +7,7 @@ if not cxx.links(prog, name: '-latomic is not needed for using __atomic builtins
   if lib_atomic.found()
     if cxx.links(prog, name: '-latomic is needed for using __atomic builtins', dependencies: lib_atomic)
       need_latomic = true
-      dep_atomic = declare_dependency(dependencies: lib_atomic)
+      dep_atomics = declare_dependency(dependencies: lib_atomic)
       summary('Atomics Library', lib_atomic, section: 'System')
     else
       error('libatomic is needed and was found, but linking with it failed')
@@ -15,6 +15,8 @@ if not cxx.links(prog, name: '-latomic is not needed for using __atomic builtins
   else
     error('libatomic is needed but could not be found')
   endif
+else
+  dep_atomics = declare_dependency()
 endif
 
-summary('Need -latomic', need_latomic, section: 'System')
+summary('Need -latomic', need_latomic, bool_yn: true, section: 'System')