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

winegcc: Use -nodefaultlibs -nostartfiles for builtin DLLs. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2019-08-06 12:28:53 +02:00 committed by Alexandre Julliard
parent 9246fca312
commit 90bed22eb7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/winegcc/winegcc.c
View File

@ -383,6 +383,7 @@ static int try_link( const strarray *prefix, const strarray *link_tool, const ch
static strarray *get_link_args( struct options *opts, const char *output_name ) static strarray *get_link_args( struct options *opts, const char *output_name )
{ {
int use_wine_crt = opts->wine_builtin && opts->shared;
const strarray *link_tool = get_translator( opts ); const strarray *link_tool = get_translator( opts );
strarray *flags = strarray_alloc(); strarray *flags = strarray_alloc();
unsigned int i; unsigned int i;
@ -437,8 +438,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name )
else strarray_add( flags, opts->gui_app ? "-mwindows" : "-mconsole" ); else strarray_add( flags, opts->gui_app ? "-mwindows" : "-mconsole" );
if (opts->unicode_app) strarray_add( flags, "-municode" ); if (opts->unicode_app) strarray_add( flags, "-municode" );
if (opts->nodefaultlibs) strarray_add( flags, "-nodefaultlibs" ); if (opts->nodefaultlibs || use_wine_crt) strarray_add( flags, "-nodefaultlibs" );
if (opts->nostartfiles) strarray_add( flags, "-nostartfiles" ); if (opts->nostartfiles || use_wine_crt) strarray_add( flags, "-nostartfiles" );
if (opts->subsystem) if (opts->subsystem)
{ {
@ -1172,7 +1173,7 @@ static void build(struct options* opts)
strarray_add(link_args, "-lc"); strarray_add(link_args, "-lc");
} }
if (opts->nodefaultlibs && is_pe) strarray_add( link_args, "-lgcc" ); if ((opts->nodefaultlibs || opts->shared) && is_pe) strarray_add( link_args, "-lgcc" );
spawn(opts->prefix, link_args, 0); spawn(opts->prefix, link_args, 0);
strarray_free (link_args); strarray_free (link_args);