Merge branch 'v0.21.x'

2020-02-04 16:49:18 +01:00
parent 4b0444e760 f1ad21d2bf
commit 3fc859c42d
11 changed files with 39 additions and 16 deletions
--- a/test/meson.build
+++ b/test/meson.build
@@ -6,10 +6,14 @@ if compiler.get_id() == 'gcc'
  gtest_compile_args += [
    '-Wno-suggest-attribute=format',
    '-Wno-suggest-attribute=noreturn',
-    '-Wno-missing-declarations',
+  ]
+endif

-    # needed on Jessie for gtest's IsNullLiteralHelper
-    '-Wno-conversion-null',
+if compiler.get_id() == 'clang' and compiler.version().version_compare('>=9')
+  gtest_compile_args += [
+    # work around clang warning caused by GTest's wrong "-lpthread"
+    # compiler flag
+    '-Wno-unused-command-line-argument',
  ]
 endif