d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: fix drivers library path on Windows

Browse Source 
import library (/IMPLIB) in meson.build should use
the 'drivers' and not 'libs' folder.

The error is: fatal error LNK1149: output filename matches input filename.
The fix uses the correct folder.

Fixes: 5ed3766981 ("drivers: process shared link dependencies as for libs")
Cc: stable@dpdk.org

Signed-off-by: Tal Shnaiderman <talshn@mellanox.com>
This commit is contained in:
Tal Shnaiderman 2020-06-29 15:37:38 +03:00 committed by Thomas Monjalon
parent abd5c69bf6
commit 77cca7ccec
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/meson.build
View File

@ -153,7 +153,7 @@ foreach class:dpdk_driver_classes
version_map = '@0@/@1@/@2@_version.map'.format(
meson.current_source_dir(),
drv_path, lib_name)
implib = dir_name + '.dll.a'
implib = 'lib' + lib_name + '.dll.a'
def_file = custom_target(lib_name + '_def',
command: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'],
@ -161,8 +161,12 @@ foreach class:dpdk_driver_classes
output: '@0@_exports.def'.format(lib_name))
lk_deps = [version_map, def_file]
if is_windows
lk_args = ['-Wl,/def:' + def_file.full_path(),
'-Wl,/implib:lib\\' + implib]
if is_ms_linker
lk_args = ['-Wl,/def:' + def_file.full_path(),
'-Wl,/implib:drivers\\' + implib]
else
lk_args = []
endif
else
lk_args = ['-Wl,--version-script=' + version_map]
# on unix systems check the output of the