Skip to content

Commit e4f2dd9

Browse files
enable rcu and drivers for MSVC
Signed-off-by: David Marchand <[email protected]>
1 parent eab3a31 commit e4f2dd9

File tree

6 files changed

+25
-31
lines changed

6 files changed

+25
-31
lines changed

drivers/meson.build

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22
# Copyright(c) 2017-2019 Intel Corporation
33

4-
if is_ms_compiler
5-
subdir_done()
6-
endif
7-
84
# Defines the order of dependencies evaluation
95
subdirs = [
106
'common',
@@ -233,24 +229,28 @@ foreach subpath:subdirs
233229
dpdk_includes += include_directories(drv_path)
234230
endif
235231

236-
# generate pmdinfo sources by building a temporary
237-
# lib and then running pmdinfogen on the contents of
238-
# that lib. The final lib reuses the object files and
239-
# adds in the new source file.
240-
out_filename = lib_name + '.pmd.c'
241-
tmp_lib = static_library('tmp_' + lib_name, sources,
242-
include_directories: includes,
243-
dependencies: static_deps,
244-
c_args: cflags)
245-
objs += tmp_lib.extract_all_objects(recursive: true)
246-
sources_pmd_info = custom_target(out_filename,
247-
command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen],
248-
output: out_filename,
249-
depends: [tmp_lib])
232+
driver_sources = sources
233+
234+
if not is_ms_compiler
235+
# generate pmdinfo sources by building a temporary
236+
# lib and then running pmdinfogen on the contents of
237+
# that lib. The final lib reuses the object files and
238+
# adds in the new source file.
239+
out_filename = lib_name + '.pmd.c'
240+
tmp_lib = static_library('tmp_' + lib_name, sources,
241+
include_directories: includes,
242+
dependencies: static_deps,
243+
c_args: cflags)
244+
objs += tmp_lib.extract_all_objects(recursive: true)
245+
sources = custom_target(out_filename,
246+
command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen],
247+
output: out_filename,
248+
depends: [tmp_lib])
249+
endif
250250

251251
# now build the static driver
252252
static_lib = static_library(lib_name,
253-
sources_pmd_info,
253+
sources,
254254
objects: objs,
255255
include_directories: includes,
256256
dependencies: static_deps,
@@ -267,7 +267,7 @@ foreach subpath:subdirs
267267
endif
268268
version_map = custom_target(lib_name + '_map',
269269
command: [gen_version_map, link_mode, abi_version_file, '@OUTPUT@', '@INPUT@'],
270-
input: sources,
270+
input: driver_sources,
271271
output: 'lib@0@_exports.map'.format(lib_name))
272272
lk_deps = [version_map]
273273

@@ -293,7 +293,7 @@ foreach subpath:subdirs
293293
depends: [version_map])
294294
endif
295295

296-
shared_lib = shared_library(lib_name, sources_pmd_info,
296+
shared_lib = shared_library(lib_name, sources,
297297
objects: objs,
298298
include_directories: includes,
299299
dependencies: shared_deps,

drivers/net/intel/i40e/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ includes += include_directories('base')
4141
if arch_subdir == 'x86'
4242
sources += files('i40e_rxtx_vec_sse.c')
4343

44-
if is_windows and cc.get_id() != 'clang'
44+
if is_windows and cc.get_id() == 'gcc'
4545
cflags += ['-fno-asynchronous-unwind-tables']
4646
endif
4747

drivers/net/intel/iavf/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ includes += include_directories('base')
2929
if arch_subdir == 'x86'
3030
sources += files('iavf_rxtx_vec_sse.c')
3131

32-
if is_windows and cc.get_id() != 'clang'
32+
if is_windows and cc.get_id() == 'gcc'
3333
cflags += ['-fno-asynchronous-unwind-tables']
3434
endif
3535

drivers/net/intel/ice/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ endif
3535
if arch_subdir == 'x86'
3636
sources += files('ice_rxtx_vec_sse.c')
3737

38-
if is_windows and cc.get_id() != 'clang'
38+
if is_windows and cc.get_id() == 'gcc'
3939
cflags += ['-fno-asynchronous-unwind-tables']
4040
endif
4141

drivers/net/intel/ixgbe/meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ deps += ['hash', 'security']
2727
if arch_subdir == 'x86'
2828
sources += files('ixgbe_rxtx_vec_sse.c')
2929
sources += files('ixgbe_recycle_mbufs_vec_common.c')
30-
if is_windows and cc.get_id() != 'clang'
30+
if is_windows and cc.get_id() == 'gcc'
3131
cflags += ['-fno-asynchronous-unwind-tables']
3232
endif
3333
elif arch_subdir == 'arm'

lib/rcu/meson.build

-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22
# Copyright(c) 2018 Arm Limited
33

4-
if is_ms_compiler
5-
build = false
6-
reason = 'not supported building with Visual Studio Toolset'
7-
subdir_done()
8-
endif
9-
104
sources = files('rte_rcu_qsbr.c')
115
headers = files('rte_rcu_qsbr.h')
126

0 commit comments

Comments
 (0)