From: Tal Shnaiderman Date: Mon, 29 Jun 2020 12:37:38 +0000 (+0300) Subject: build: fix drivers library path on Windows X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=77cca7ccec13b617c64f21c573c9e6ac5b4aed64;hp=abd5c69bf673dabe3c5acd8b839e6745d8d18322;p=dpdk.git build: fix drivers library path on Windows 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 --- diff --git a/drivers/meson.build b/drivers/meson.build index 6ce2d6b503..ccdc73868b 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -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