ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makedep: Use -fno-builtin for crt modules.

Browse Source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-12-03 19:11:35 +01:00 committed by Alexandre Julliard
parent 1913affb7b
commit 727168a9e1
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/makedep.c
View File

@ -2276,6 +2276,15 @@ static struct strarray get_default_imports( const struct makefile *make )
}
/*******************************************************************
* is_crt_module
*/
static int is_crt_module( const char *file )
{
return !strncmp( file, "msvcr", 5 ) || !strncmp( file, "ucrt", 4 ) || !strcmp( file, "crtdll.dll" );
}
/*******************************************************************
* add_crt_import
*/
@ -2286,16 +2295,13 @@ static void add_crt_import( const struct makefile *make, struct strarray *import
for (i = 0; i < imports->count; i++)
{
if (strncmp( imports->str[i], "msvcr", 5 ) && strncmp( imports->str[i], "ucrt", 4 )) continue;
if (!is_crt_module( imports->str[i])) continue;
if (crt_dll) fatal_error( "More than one C runtime DLL imported: %s and %s\n", crt_dll, imports->str[i] );
crt_dll = imports->str[i];
}
if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" ))
{
if (make->module &&
(!strncmp( make->module, "msvcr", 5 ) ||
!strncmp( make->module, "ucrt", 4 ) ||
!strcmp( make->module, "crtdll.dll" )))
if (make->module && is_crt_module( make->module ))
{
crt_dll = make->module;
}
@ -3147,7 +3153,8 @@ static void output_source_default( struct makefile *make, struct incl_file *sour
output( "\t$(CROSSCC) -c -o $@ %s", source->filename );
output_filenames( defines );
output_filenames( extra_cross_cflags );
if (source->file->flags & FLAG_C_IMPLIB) output_filename( "-fno-builtin" );
if (source->file->flags & FLAG_C_IMPLIB || (make->module && is_crt_module( make->module )))
output_filename( "-fno-builtin" );
output_filenames( cpp_flags );
output_filename( "$(CROSSCFLAGS)" );
output( "\n" );