From: Jacek Caban <jacek@codeweavers.com> --- tools/makedep.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index a26fa44834e..dcfaebe9ff6 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2322,6 +2322,9 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra /* add crt import lib only when adding the default imports libs */ if (is_crt_module( name ) && type != IMPORT_TYPE_DEFAULT) continue; + /* when importing itself, skip the import and add object files instead */ + if (make->importlib && !strcmp( make->importlib, name )) continue; + if (name[0] == '-') { switch (name[1]) @@ -3363,7 +3366,12 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou if (source->file->flags & FLAG_C_UNIX) strarray_add( &make->unixobj_files, obj_name ); else if (source->file->flags & FLAG_C_IMPLIB) + { strarray_add( &make->implib_files[arch], obj_name ); + /* if we're importing ourselves, add importlib object files to object_files as well */ + if (make->importlib && strarray_exists( make->imports, make->importlib )) + strarray_add( &make->object_files[arch], obj_name ); + } else if (!(source->file->flags & FLAG_TESTDLL)) strarray_add( &make->object_files[arch], obj_name ); else -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9265