Allow compiling with clang.

gaperez64 · Jul 8, 2022 · 3d4ecc1 · 3d4ecc1
1 parent bcf50db
commit 3d4ecc1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/meson.build b/meson.build
@@ -3,8 +3,14 @@ project ('Acacia Bonsai', ['c', 'cpp'],
          version : '0.0.1',
          license : 'GPL-3.0')
 
-add_global_arguments (['-ftrack-macro-expansion=0',
-                       '-fno-diagnostics-show-caret'], language: 'cpp')
+if meson.get_compiler('cpp').get_id() == 'clang'
+  extra_args = []
+else
+  extra_args = ['-ftrack-macro-expansion=0',
+                '-fno-diagnostics-show-caret']
+endif
+
+add_global_arguments (extra_args, language: 'cpp')
 
 spot_dep = dependency('libspot')
 bddx_dep = dependency('libbddx')

diff --git a/subprojects/gnulib/localcharset.c b/subprojects/gnulib/localcharset.c
@@ -581,7 +581,7 @@ struct table_entry
 };
 
 /* Table of platform-dependent mappings, sorted in ascending order.  */
-[[maybe_unused]] static const struct table_entry locale_table[] =
+_GL_ATTRIBUTE_MAYBE_UNUSED static const struct table_entry locale_table[] =
   {
 # if defined __FreeBSD__                                    /* FreeBSD 4.2 */
     { "cs_CZ.ISO_8859-2",  "ISO-8859-2" },