Meson: Minor refactor of platform detection

diff --git a/meson/platform/meson.build b/meson/platform/meson.build
index f972ea84618e3119cad596f01aec016ad74980ec..ea2a123bc1f96ad8b3964784d1e1c7cdde9bdab9 100644 (file)
--- a/meson/platform/meson.build
+++ b/meson/platform/meson.build
@@ -32,13 +32,13 @@ platform_deps = []
 
 foreach platform: platforms
   name = platform['name']
+  set_variable('have_' + name, system == name)
+
   config_defines = 'config-defines' in platform ? platform['config-defines'] : []
   cmdline_defines = 'cmdline-defines' in platform ? platform['cmdline-defines'] : []
   libraries = 'libraries' in platform ? platform['libraries'] : []
 
   if system == name
-    set_variable('have_' + name, true)
-
     platform_defines = []
     foreach define: config_defines
       define_name = define['name']
@@ -56,8 +56,6 @@ foreach platform: platforms
     endforeach
 
     summary('Platform Defines', platform_defines, section: 'System')
-
-    break
   endif
 endforeach
 

diff --git a/pdns/meson.build b/pdns/meson.build
index 54146e22783265f480ef08082343235c191bd5d2..dd62220c1a7dec6c3cf3ad199a147546ae01406a 100644 (file)
--- a/pdns/meson.build
+++ b/pdns/meson.build
@@ -142,15 +142,15 @@ libpdns_bind_dnssec_schema = declare_dependency(sources: libpdns_bind_dnssec_sch
 conditional_sources = {
   'sunos-devpollmplexer': {
     'sources': ['devpollmplexer.cc', 'portsmplexer.cc'],
-    'condition': get_variable('have_sunos', false),
+    'condition': have_sunos,
   },
   'linux-epollmplexer': {
     'sources': ['epollmplexer.cc'],
-    'condition': get_variable('have_linux', false),
+    'condition': have_linux,
   },
   'bsd-kqueuemplexer': {
     'sources': ['kqueuemplexer.cc'],
-    'condition': get_variable('have_openbsd', false) or get_variable('have_freebsd', false),
+    'condition': have_openbsd or have_freebsd,
   },
   'ssqlite3': {
     'sources': ['ssqlite3.cc'],