Alexandre Julliard : makefiles: Always use winebuild to build static libraries.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9248dbaf0d4e52b601855fe367dfda4c5c46d5ee
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9248dbaf0d4e52b601855fe36...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Sun Nov 14 12:27:32 2021 +0100

makefiles: Always use winebuild to build static libraries.

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

---

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

diff --git a/tools/makedep.c b/tools/makedep.c
index 161cbb8d879..1ef79ebfa88 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -3423,13 +3423,15 @@ static void output_module( struct makefile *make )
 static void output_static_lib( struct makefile *make )
 {
     strarray_add( &make->clean_files, make->staticlib );
-    output( "%s:", obj_dir_path( make, make->staticlib ));
+    output( "%s: %s", obj_dir_path( make, make->staticlib ), tools_path( make, "winebuild" ));
     output_filenames_obj_dir( make, make->object_files );
     output_filenames_obj_dir( make, make->unixobj_files );
-    output( "\n\t%srm -f $@ && %s rc $@", cmd_prefix( "AR" ), ar );
+    output( "\n" );
+    output( "\t%s%s -w --staticlib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ));
+    output_filenames( target_flags );
     output_filenames_obj_dir( make, make->object_files );
     output_filenames_obj_dir( make, make->unixobj_files );
-    output( " && %s $@\n", ranlib );
+    output( "\n" );
     add_install_rule( make, make->staticlib, make->staticlib, strmake( "d%s/%s", so_dir, make->staticlib ));
     if (crosstarget)
     {
@@ -4042,7 +4044,6 @@ static void output_silent_rules(void)
 {
     static const char *cmds[] =
     {
-        "AR",
         "BISON",
         "BUILD",
         "CC",