From: Lzu Tao <taolzu@gmail.com>
Date: Wed, 28 Nov 2018 18:26:41 +0000 (+0700)
Subject: Rename meson variables
X-Git-Tag: v1.3.8~36^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3134a3ed3674088e952813945bf1b7c9c4b73f8;p=thirdparty%2Fzstd.git

Rename meson variables
---

diff --git a/contrib/meson/meson.build b/contrib/meson/meson.build
index 065c5e1b9..a8df86b85 100644
--- a/contrib/meson/meson.build
+++ b/contrib/meson/meson.build
@@ -86,14 +86,14 @@ lzma_dep = dependency('lzma', required: false)
 
 if cxx.get_id() == 'gcc' or cxx.get_id() == 'clang'
     common_flags = [ '-DXXH_NAMESPACE=ZSTD_' ]
-    zstd_compilation_flags = [ '-Wextra', '-Wundef', '-Wshadow', '-Wcast-align', '-Wcast-qual' ]
-    cc_common_flags = cc.get_supported_arguments(zstd_compilation_flags)
-    cc_common_flags += cc.get_supported_arguments(['-Wstrict-prototypes'])
-    cc_common_flags += common_flags
-    cxx_common_flags = cxx.get_supported_arguments(zstd_compilation_flags)
-    cxx_common_flags += common_flags
-    add_project_arguments(cc_common_flags, language : 'c')
-    add_project_arguments(cxx_common_flags, language : 'cpp')
+    common_warning_flags = [ '-Wextra', '-Wundef', '-Wshadow', '-Wcast-align', '-Wcast-qual' ]
+    cc_compilation_flags = cc.get_supported_arguments(common_warning_flags)
+    cc_compilation_flags += cc.get_supported_arguments(['-Wstrict-prototypes'])
+    cc_compilation_flags += common_flags
+    cxx_compilation_flags = cxx.get_supported_arguments(common_warning_flags)
+    cxx_compilation_flags += common_flags
+    add_project_arguments(cc_compilation_flags, language : 'c')
+    add_project_arguments(cxx_compilation_flags, language : 'cpp')
 endif
 
 # =============================================================================