Jacek Caban : makedep: Build builtin DLLs with ucrtbase.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Fri Mar 20 14:36:37 2020 +0100

makedep: Build builtin DLLs with ucrtbase.

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

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

diff --git a/tools/makedep.c b/tools/makedep.c
index c415c5e84f..4f19231e7c 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -4268,16 +4268,16 @@ static void load_sources( struct makefile *make )
             if (crt_dll) fatal_error( "More than one crt DLL imported: %s %s\n", crt_dll, make->imports.str[i] );
             crt_dll = make->imports.str[i];
         }
-        if (!crt_dll)
+        if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" ))
         {
-            if (make->use_msvcrt && make->is_exe)
+            if (make->use_msvcrt && !make->testdll && !make->staticlib)
             {
                 strarray_add( &make->imports, "ucrtbase" );
                 crt_dll = "ucrtbase";
             }
             else crt_dll = "msvcrt";
         }
-        if (!strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" );
+        if (crt_dll && !strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" );
     }
 
     LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 );