Alexandre Julliard : makefiles: Always expand the library name for cross-compiled import libraries.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ffd2e484ba744c8a9ae8611bae6d613eabcf2342
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ffd2e484ba744c8a9ae8611bae...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Sat Mar 26 14:57:39 2016 +0900

makefiles: Always expand the library name for cross-compiled import libraries.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 tools/makedep.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index 7f81208..98645db 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2001,13 +2001,11 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra
 
             if (submake->importlib && !strcmp( submake->importlib, name ))
             {
-                const char *dir = top_obj_dir_path( make, submake->base_dir );
-                const char *ext = cross ? "cross.a" : *dll_ext ? "def" : "a";
-
-                if (!cross && submake->staticimplib)
-                    lib = base_dir_path( submake, submake->staticimplib );
+                if (cross || !*dll_ext || submake->staticimplib)
+                    lib = base_dir_path( submake, strmake( "lib%s.a", name ));
                 else
-                    strarray_add( deps, strmake( "%s/lib%s.%s", dir, name, ext ));
+                    strarray_add( deps, top_obj_dir_path( make,
+                                            strmake( "%s/lib%s.def", submake->base_dir, name )));
                 break;
             }
 
@@ -2016,6 +2014,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra
 
         if (lib)
         {
+            if (cross) lib = replace_extension( lib, ".a", ".cross.a" );
             lib = top_obj_dir_path( make, lib );
             strarray_add( deps, lib );
             strarray_add( &ret, lib );