From 05b774fb48dac5f412e3490313c6e70199013568 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Fri, 20 Mar 2020 14:36:37 +0100 Subject: [PATCH] makedep: Build builtin DLLs with ucrtbase. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- tools/makedep.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c415c5e84f7..4f19231e7c5 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 );