Alexandre Julliard : makefiles: Don't use bundled libraries to build native programs.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 53e207fde0a62850eaf6b2316788a6729f47a55e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=53e207fde0a62850eaf6b2316...

Author: Alexandre Julliard 
Date:   Mon Nov 22 18:32:35 2021 +0100

makefiles: Don't use bundled libraries to build native programs.

Signed-off-by: Alexandre Julliard

---

tools/makedep.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index bf8d3a126e3..d0dc9e3d01d 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -3404,7 +3404,8 @@ static void output_shared_lib( struct makefile *make )

strarray_addall( &dep_libs, get_local_dependencies( make, basename, make->in_files ));
     strarray_addall( &all_libs, get_expanded_file_local_var( make, basename, "LDFLAGS" ));
-    strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs ));
+    strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" ));
+    strarray_addall( &all_libs, libs );

output( "%s:", obj_dir_path( make, make->sharedlib ));
     output_filenames_obj_dir( make, make->object_files );
@@ -3518,7 +3519,10 @@ static void output_programs( struct makefile *make )

if (!objs.count) objs = make->object_files;
         if (!strarray_exists( &all_libs, "-nodefaultlibs" ))
-            strarray_addall( &all_libs, add_unix_libraries( make, &deps ));
+        {
+            strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" ));
+            strarray_addall( &all_libs, libs );
+        }

output( "%s:", obj_dir_path( make, program ) );
         output_filenames_obj_dir( make, objs );