Skip to content

Commit f78168a

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

File tree

2 files changed

+20
-26
lines changed

2 files changed

+20
-26
lines changed

drivers/meson.build

+20-20
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 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

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)