[PATCH v2 3/6] makedep: Link with imported libs before delay imported libs.

[Rémi Bernon]

From: Rémi Bernon

In order to favor direct imports over delayed imports, for instance when
the delay imported module forwards symbols from the imported module.
---
 tools/makedep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index 527cbd3c058..d7e045bdd6e 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -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)