build: compiler attribute improvements

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
lxc · Sep 29, 2021 · ff354ed · ff354ed
1 parent 6187bcb
commit ff354ed
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/meson.build b/meson.build
@@ -355,8 +355,13 @@ conf.set10('HAVE_STRCHRNUL', have)
 have = cc.has_function('openpty', prefix : '#include <pty.h>', args : '-D_GNU_SOURCE')
 conf.set10('HAVE_OPENPTY', have)
 
-conf.set10('HAVE_COMPILER_ATTR_NONNULL', cc.has_function_attribute('nonnull'))
-conf.set10('HAVE_COMPILER_ATTR_RETURNS_NONNULL', cc.has_function_attribute('returns_nonnull'))
+foreach ccattr : ['fallthrough',
+		  'nonnull',
+		  'returns_nonnull',
+		 ]
+
+        conf.set10('HAVE_COMPILER_ATTR_' + ccattr.underscorify().to_upper(), cc.has_function_attribute(ccattr))
+endforeach
 
 config_h = configure_file(
         output : 'config.h',

diff --git a/src/lxc/compiler.h b/src/lxc/compiler.h
@@ -18,7 +18,7 @@
 #endif
 #endif
 
-#if __GNUC__ >= 7
+#if HAVE_COMPILER_ATTR_FALLTHROUGH
 #define __fallthrough __attribute__((__fallthrough__))
 #else
 #define __fallthrough /* fall through */