ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-03-26 14:57:39 +09:00
parent 058783b8b4
commit ffd2e484ba
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/makedep.c
View File

@ -2001,13 +2001,11 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra
if (submake->importlib && !strcmp( submake->importlib, name )) if (submake->importlib && !strcmp( submake->importlib, name ))
{ {
const char *dir = top_obj_dir_path( make, submake->base_dir ); if (cross || !*dll_ext || submake->staticimplib)
const char *ext = cross ? "cross.a" : *dll_ext ? "def" : "a"; lib = base_dir_path( submake, strmake( "lib%s.a", name ));
if (!cross && submake->staticimplib)
lib = base_dir_path( submake, submake->staticimplib );
else 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; break;
} }
@ -2016,6 +2014,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra
if (lib) if (lib)
{ {
if (cross) lib = replace_extension( lib, ".a", ".cross.a" );
lib = top_obj_dir_path( make, lib ); lib = top_obj_dir_path( make, lib );
strarray_add( deps, lib ); strarray_add( deps, lib );
strarray_add( &ret, lib ); strarray_add( &ret, lib );