X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=blobdiff_plain;f=lib%2Fmeson.build;h=cbcb985beb56785120cd46b28c1c49ab3d404848;hp=d190d84effafe6c239743d1438d0ac00e44a426c;hb=309bf90bf99e1e3b41e2abfdfd0f15f8299034b8;hpb=77cca7ccec13b617c64f21c573c9e6ac5b4aed64 diff --git a/lib/meson.build b/lib/meson.build index d190d84eff..cbcb985beb 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -146,19 +146,28 @@ foreach l:libraries meson.current_source_dir(), dir_name, name) implib = dir_name + '.dll.a' - def_file = custom_target(name + '_def', - command: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'], + def_file = custom_target(libname + '_def', + command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], input: version_map, - output: 'rte_@0@_exports.def'.format(name)) + output: '@0@_exports.def'.format(libname)) + + mingw_map = custom_target(libname + '_mingw', + command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], + input: version_map, + output: '@0@_mingw.map'.format(libname)) if is_ms_linker lk_args = ['-Wl,/def:' + def_file.full_path(), '-Wl,/implib:lib\\' + implib] else - lk_args = ['-Wl,--version-script=' + version_map] + if is_windows + lk_args = ['-Wl,--version-script=' + mingw_map.full_path()] + else + lk_args = ['-Wl,--version-script=' + version_map] + endif endif - lk_deps = [version_map, def_file] + lk_deps = [version_map, def_file, mingw_map] if not is_windows # on unix systems check the output of the # check-symbols.sh script, using it as a