From 23d751507e4b2ef99dc27cc6f691835b52dc9b50 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Sun, 2 Dec 2018 22:33:25 +0700 Subject: [PATCH] meson: Use -werror build option instead of adding -Werror [skip ci] --- build/meson/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/meson/meson.build b/build/meson/meson.build index c36c9425a..2e1f9d06b 100644 --- a/build/meson/meson.build +++ b/build/meson/meson.build @@ -68,6 +68,7 @@ zstd_docdir = join_paths(zstd_datadir, 'doc', meson.project_name()) # Built-in options use_debug = get_option('debug') +buildtype = get_option('buildtype') # Custom options debug_level = get_option('debug_level') @@ -132,7 +133,9 @@ add_project_arguments('-DXXH_NAMESPACE=ZSTD_', language: ['c']) if [compiler_gcc, compiler_clang].contains(cc_id) common_warning_flags = [ '-Wextra', '-Wundef', '-Wshadow', '-Wcast-align', '-Wcast-qual' ] if cc_id == compiler_clang - common_warning_flags += ['-Werror', '-Wconversion', '-Wno-sign-conversion', '-Wdocumentation'] + # Should use Meson's own --werror build option + #common_warning_flags += '-Werror' + common_warning_flags += ['-Wconversion', '-Wno-sign-conversion', '-Wdocumentation'] endif cc_compile_flags = cc.get_supported_arguments(common_warning_flags + ['-Wstrict-prototypes']) cxx_compile_flags = cxx.get_supported_arguments(common_warning_flags)