For non-AVX builds, the cflags used for compiling the i40e driver files
are not passed to the call to build the AVX-specific code path. This can
cause build failures.

../drivers/net/i40e/i40e_ethdev.h:888:42: error: ‘I40E_PFQF_HKEY_MAX_INDEX’ 
undeclared here (not in a function)

Fixes: e940646b20fa ("drivers/net: build Intel NIC PMDs with meson")

Reported-by: Shreyansh Jain <shreyansh.j...@nxp.com>
Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
Tested-by: Shreyansh Jain <shreyansh.j...@nxp.com>

----
Testing previously done on draft version of this patch. Ref:
http://dpdk.org/ml/archives/dev/2018-May/100301.html
---
 drivers/net/i40e/meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build
index f2129df07..d783f3626 100644
--- a/drivers/net/i40e/meson.build
+++ b/drivers/net/i40e/meson.build
@@ -25,6 +25,7 @@ sources = files(
        )
 
 deps += ['hash']
+includes += include_directories('base')
 
 if arch_subdir == 'x86'
        dpdk_conf.set('RTE_LIBRTE_I40E_INC_VECTOR', 1)
@@ -40,11 +41,10 @@ if arch_subdir == 'x86'
                                'i40e_rxtx_vec_avx2.c',
                                dependencies: [static_rte_ethdev,
                                        static_rte_kvargs, static_rte_hash],
-                               c_args: '-mavx2')
+                               include_directories: includes,
+                               c_args: [cflags, '-mavx2'])
                objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
        endif
 endif
 
-includes += include_directories('base')
-
 install_headers('rte_pmd_i40e.h')
-- 
2.14.3

Reply via email to