makedep: Don't try to use .delay.a extension for non-PE delay imports.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

makedep: Don't try to use .delay.a extension for non-PE delay imports.
c18443aa · Jacek Caban · Alexandre Julliard · ea9f47a7 · c18443aa
Commit c18443aa authored Apr 21, 2020 by Jacek Caban Committed by Alexandre Julliard Apr 22, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

makedep.c tools/makedep.c +4 -2

No files found.
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2219,8 +2219,10 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra

        if (lib)
        {
-            if (delay && !delay_load_flag) lib = replace_extension( lib, ".a", ".delay.a" );
-            else if (make->is_cross) lib = replace_extension( lib, ".a", ".cross.a" );
+            if (delay && !delay_load_flag && (make->is_cross || !*dll_ext))
+                lib = replace_extension( lib, ".a", ".delay.a" );
+            else if (make->is_cross)
+                lib = replace_extension( lib, ".a", ".cross.a" );
            lib = top_obj_dir_path( make, lib );
            strarray_add( deps, lib );
            strarray_add( &ret, lib );