makedep: Link with imported libs before delay imported libs.

In order to favor direct imports over delayed imports, for instance when
the delay imported module forwards symbols from the imported module.
This commit is contained in:
Rémi Bernon 2022-09-29 20:05:30 +02:00 committed by Alexandre Julliard
parent 214223edc3
commit c90e03e3cb

View file

@ -3176,8 +3176,8 @@ static void output_module( struct makefile *make )
if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports );
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, make->is_cross ));
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross ));
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, make->is_cross ));
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, make->is_cross ) );
if (!make->use_msvcrt)