marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Only cross-compile the static libraries that are actually used. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
stable
Alexandre Julliard 2019-05-03 11:18:00 +02:00
parent bbc302290b
commit c685acba64
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/makedep.c
View File

@ -2086,8 +2086,14 @@ static struct makefile *get_parent_makefile( struct makefile *make )
static int needs_cross_lib( const struct makefile *make )
{
if (!crosstarget) return 0;
if (!make->importlib) return 0;
return strarray_exists( &cross_import_libs, make->importlib );
if (make->importlib) return strarray_exists( &cross_import_libs, make->importlib );
if (make->staticlib)
{
const char *name = replace_extension( make->staticlib, ".a", "" );
if (!strncmp( name, "lib", 3 )) name += 3;
return strarray_exists( &cross_import_libs, name );
}
return 0;
}
@ -2974,7 +2980,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour
(make->is_cross ||
((source->file->flags & FLAG_C_IMPLIB) &&
(needs_cross_lib( make ) || needs_delay_lib( make ))) ||
(make->module && make->staticlib)));
(make->staticlib && needs_cross_lib( make ))));
int need_obj = (!need_cross ||
(source->file->flags & FLAG_C_IMPLIB) ||
(make->module && make->staticlib));
@ -3289,7 +3295,7 @@ static void output_static_lib( struct makefile *make )
output( "\n\t%s $@\n", ranlib );
add_install_rule( make, make->staticlib, make->staticlib,
strmake( "d$(dlldir)/%s", make->staticlib ));
if (crosstarget && make->module)
if (needs_cross_lib( make ))
{
char *name = replace_extension( make->staticlib, ".a", ".cross.a" );