Jacek Caban : makedep: Don't try to use .delay.a extension for non-PE delay imports.
Alexandre Julliard
julliard at winehq.org
Wed Apr 22 15:29:28 CDT 2020
Module: wine
Branch: master
Commit: c18443aadbca55b03bd3fcf1414ee2b452143b69
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c18443aadbca55b03bd3fcf1414ee2b452143b69
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Apr 21 19:02:42 2020 +0200
makedep: Don't try to use .delay.a extension for non-PE delay imports.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
tools/makedep.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/makedep.c b/tools/makedep.c
index c3169204f1..fb2e145ced 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 );
More information about the wine-cvs
mailing list