Module: wine Branch: master Commit: 4ec4988c2eb587c08b7bb7dab6e90ff6014cb6e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ec4988c2eb587c08b7bb7dab...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Mar 4 17:15:50 2020 +0100
makedep: Use winebuild to build cross compiled static libraries.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
tools/makedep.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/makedep.c b/tools/makedep.c index c324802916..c415c5e84f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3382,12 +3382,12 @@ static void output_static_lib( struct makefile *make ) char *name = replace_extension( make->staticlib, ".a", ".cross.a" );
strarray_add( &make->all_targets, name ); - output( "%s:", obj_dir_path( make, name )); + output( "%s: %s", obj_dir_path( make, name ), tools_path( make, "winebuild" )); output_filenames_obj_dir( make, make->crossobj_files ); - output( "\n\trm -f $@\n" ); - output( "\t%s-ar rc $@", crosstarget ); + output( "\n" ); + output( "\t%s -b %s -w --staticlib -o $@", tools_path( make, "winebuild" ), crosstarget ); output_filenames_obj_dir( make, make->crossobj_files ); - output( "\n\t%s-ranlib $@\n", crosstarget ); + output( "\n" ); } }