From c18443aadbca55b03bd3fcf1414ee2b452143b69 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 21 Apr 2020 19:02:42 +0200 Subject: [PATCH] makedep: Don't try to use .delay.a extension for non-PE delay imports. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- tools/makedep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c3169204f19..fb2e145ced2 100644 --- 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 );