From: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 19 Jul 2018 14:22:06 +0000 (+0100)
Subject: build: remove duplicate checks for cflags
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=3e3eeb4d5ff754c3425fc38a4cbd2f6be872f1d9;p=dpdk.git

build: remove duplicate checks for cflags

There is no need to check for each library, driver and example whether
certain cflags are supported. Instead of checking inside the loop, do
so outside and reuse the value.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---

diff --git a/drivers/meson.build b/drivers/meson.build
index 27d66cf76e..f94e2fe672 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -11,6 +11,10 @@ driver_classes = ['common',
 	       'event',   # depends on common, bus, mempool and net.
 	       'raw']     # depends on common, bus, mempool, net and event.
 
+default_cflags = machine_args
+if cc.has_argument('-Wno-format-truncation')
+	default_cflags += '-Wno-format-truncation'
+endif
 foreach class:driver_classes
 	drivers = []
 	std_deps = []
@@ -31,10 +35,7 @@ foreach class:driver_classes
 		allow_experimental_apis = false
 		sources = []
 		objs = []
-		cflags = machine_args
-		if cc.has_argument('-Wno-format-truncation')
-			cflags += '-Wno-format-truncation'
-		endif
+		cflags = default_cflags
 		includes = [include_directories(drv_path)]
 		# set up internal deps. Drivers can append/override as necessary
 		deps = std_deps
diff --git a/examples/meson.build b/examples/meson.build
index e6558875ac..4ee7a11141 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -18,15 +18,16 @@ else
 	examples = get_option('examples').split(',')
 	allow_skips = false # error out if we can't build a requested app
 endif
+default_cflags = machine_args
+if cc.has_argument('-Wno-format-truncation')
+	default_cflags += '-Wno-format-truncation'
+endif
 foreach example: examples
 	name = example
 	build = true
 	sources = []
 	allow_experimental_apis = false
-	cflags = machine_args
-	if cc.has_argument('-Wno-format-truncation')
-		cflags += '-Wno-format-truncation'
-	endif
+	cflags = default_cflags
 
 	ext_deps = [execinfo]
 	includes = [include_directories(example)]
diff --git a/lib/meson.build b/lib/meson.build
index eeac10e2b1..eb91f100bc 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -26,6 +26,10 @@ libraries = [ 'compat', # just a header, used for versioning
 	# flow_classify lib depends on pkt framework table lib
 	'flow_classify', 'bpf']
 
+default_cflags = machine_args
+if cc.has_argument('-Wno-format-truncation')
+	default_cflags += '-Wno-format-truncation'
+endif
 foreach l:libraries
 	build = true
 	name = l
@@ -34,11 +38,7 @@ foreach l:libraries
 	sources = []
 	headers = []
 	includes = []
-	cflags = machine_args
-	if cc.has_argument('-Wno-format-truncation')
-	    cflags += '-Wno-format-truncation'
-	endif
-
+	cflags = default_cflags
 	objs = [] # other object files to link against, used e.g. for
 	          # instruction-set optimized versions of code