From: Ophir Munk <ophi...@nvidia.com>
Prior to this commit meson did not progress beyond directory
drivers/common for Windows compilations. This commit enables drivers
compilation under this directory.
Signed-off-by: Ophir Munk <ophi...@nvidia.com>
Signed-off-by: Tal Shnaiderman <tal...@nvidia.com>
Acked-by: Matan Azrad <ma...@nvidia.com>
---
v3: change commit place with dependencies.
Depends-on: patch-82392 ("net/mlx5: fix flow sample definitions")
Depends-on: patch-85737 ("mlx5: split multi-threaded flows per OS")
Depends-on: patch-85621 ("build: i40e PMD on Windows")
---
drivers/common/meson.build | 8 +++-----
drivers/common/mlx5/meson.build | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/common/meson.build b/drivers/common/meson.build
index d78882f05e..be97424548 100644
--- a/drivers/common/meson.build
+++ b/drivers/common/meson.build
@@ -1,10 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Cavium, Inc
-if is_windows
- subdir_done()
+if not is_windows
+ std_deps = ['eal']
+ drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2',
'sfc_efx']
endif
-
-std_deps = ['eal']
-drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2', 'sfc_efx']
config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'
diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
index 3dacc6f683..3047b455cf 100644
--- a/drivers/common/mlx5/meson.build
+++ b/drivers/common/mlx5/meson.build
@@ -1,9 +1,9 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2019 Mellanox Technologies, Ltd
-if not is_linux
+if not (is_linux or (is_windows and is_ms_linker))
build = false
- reason = 'only supported on Linux'
+ reason = 'only supported on Linux and Windows build with clang'
subdir_done()
endif
--
2.16.1.windows.4
