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

makefiles: Don't depend on cross import library if not necessary.

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-05-16 22:54:45 +02:00
parent 6c41cc6152
commit 40a76a212b
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/makedep.c
View File

@ -3553,9 +3553,13 @@ static void output_subdirs( struct makefile *make )
} }
else else
{ {
strarray_add( &build_deps, strmake( "%s.a", importlib_path )); if (needs_delay_lib( submake ))
if (needs_delay_lib( submake )) output( "%s.delay.a ", importlib_path ); {
output( "%s.delay.a ", importlib_path );
strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path ));
}
output( "%s.a: %s", importlib_path, spec_file ); output( "%s.a: %s", importlib_path, spec_file );
strarray_add( &build_deps, strmake( "%s.a", importlib_path ));
} }
output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winebuild" ));
output( "\n" ); output( "\n" );
@ -3568,8 +3572,16 @@ static void output_subdirs( struct makefile *make )
output( "\n" ); output( "\n" );
if (crosstarget && (needs_cross_lib( submake ) || needs_delay_lib( submake ))) if (crosstarget && (needs_cross_lib( submake ) || needs_delay_lib( submake )))
{ {
if (needs_cross_lib( submake )) output_filename( strmake( "%s.cross.a", importlib_path )); if (needs_cross_lib( submake ))
if (needs_delay_lib( submake )) output_filename( strmake( "%s.delay.a", importlib_path )); {
output_filename( strmake( "%s.cross.a", importlib_path ));
strarray_add( &build_deps, strmake( "%s.cross.a", importlib_path ));
}
if (needs_delay_lib( submake ))
{
output_filename( strmake( "%s.delay.a", importlib_path ));
strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path ));
}
output( ": %s", spec_file ); output( ": %s", spec_file );
output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winebuild" ));
output( "\n" ); output( "\n" );
@ -3578,10 +3590,7 @@ static void output_subdirs( struct makefile *make )
output_filename( "--export" ); output_filename( "--export" );
output_filename( spec_file ); output_filename( spec_file );
output( "\n" ); output( "\n" );
strarray_add( &build_deps, strmake( "%s.cross.a", importlib_path ));
} }
if (needs_delay_lib( submake ))
strarray_add( &build_deps, strmake( "%s.delay.a", importlib_path ));
} }
strarray_addall( &symlinks, output_importlib_symlinks( make, submake )); strarray_addall( &symlinks, output_importlib_symlinks( make, submake ));
} }