Alexandre Julliard : makefiles: Don't use standard libs for programs that specify -nodefaultlibs.

Alexandre Julliard julliard at winehq.org
Tue Apr 7 15:27:15 CDT 2020


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Apr  7 20:55:04 2020 +0200

makefiles: Don't use standard libs for programs that specify -nodefaultlibs.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tools/makedep.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index 9b64f0fed4..c3169204f1 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -3518,7 +3518,8 @@ static void output_programs( struct makefile *make )
         struct strarray symlinks = get_expanded_file_local_var( make, make->programs.str[i], "SYMLINKS" );
 
         if (!objs.count) objs = make->object_files;
-        strarray_addall( &all_libs, add_default_libraries( make, &deps ));
+        if (!strarray_exists( &all_libs, "-nodefaultlibs" ))
+            strarray_addall( &all_libs, add_default_libraries( make, &deps ));
 
         output( "%s:", obj_dir_path( make, program ) );
         output_filenames_obj_dir( make, objs );




More information about the wine-cvs mailing list