summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-12-08 04:10:26 +0000
committerMatthias Clasen <mclasen@redhat.com>2019-12-08 04:10:26 +0000
commit8c5ef455e8cf21ae50b9ce8e86ca74734c45c3db (patch)
tree762973c154a1a0cc999008e31abdaf44f3865193
parent29019094450227a68cacd5170ce7b5735bb2faef (diff)
parenta2864370a0c6751faa4b3ef3b9dc0390b4d1ba46 (diff)
downloadpango-8c5ef455e8cf21ae50b9ce8e86ca74734c45c3db.tar.gz
Merge branch 'fix-build' into 'master'
build: Move C-only warning flags to right place See merge request GNOME/pango!166
-rw-r--r--meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index 55f62974..d4cff2af 100644
--- a/meson.build
+++ b/meson.build
@@ -69,6 +69,8 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
'-Wold-style-definition',
'-Wno-int-conversion',
'-Wno-discarded-qualifiers',
+ '-Werror=implicit',
+ '-Werror=pointer-to-int-cast',
]
test_cflags = test_c_only_flags + [
@@ -86,7 +88,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
'-Wlogical-op',
'-Wno-uninitialized',
'-Wno-shadow',
- '-Werror=implicit',
'-Werror=implicit-fallthrough',
'-Werror=nonnull',
'-Werror=init-self',
@@ -99,7 +100,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
'-Werror=write-strings',
'-Werror=address',
'-Werror=int-to-pointer-cast',
- '-Werror=pointer-to-int-cast',
'-Werror=empty-body',
'-Werror=write-strings',
'-Werror=unused-but-set-variable',