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

winegcc: Fixup constructors after building a module. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-04-16 12:21:48 +02:00
parent 6c4046fef1
commit c30d30d328
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/winegcc/winegcc.c
View File

@ -936,6 +936,16 @@ static strarray *get_winebuild_args(struct options *opts)
return spec_args; return spec_args;
} }
static void fixup_constructors( struct options *opts, const char *file )
{
strarray *args = get_winebuild_args( opts );
strarray_add( args, "--fixup-ctors" );
strarray_add( args, file );
spawn( opts->prefix, args, 0 );
strarray_free( args );
}
static void make_wine_builtin( struct options *opts, const char *file ) static void make_wine_builtin( struct options *opts, const char *file )
{ {
strarray *args = get_winebuild_args( opts ); strarray *args = get_winebuild_args( opts );
@ -1354,8 +1364,6 @@ static void build(struct options* opts)
spawn(opts->prefix, link_args, 0); spawn(opts->prefix, link_args, 0);
strarray_free (link_args); strarray_free (link_args);
if (is_pe && opts->wine_builtin) make_wine_builtin( opts, output_path );
/* set the base address with prelink if linker support is not present */ /* set the base address with prelink if linker support is not present */
if (opts->prelink && !opts->target) if (opts->prelink && !opts->target)
{ {
@ -1371,6 +1379,9 @@ static void build(struct options* opts)
} }
} }
if (!is_pe && !opts->shared) fixup_constructors( opts, output_path );
if (is_pe && opts->wine_builtin) make_wine_builtin( opts, output_path );
/* create the loader script */ /* create the loader script */
if (generate_app_loader) if (generate_app_loader)
create_file(output_file, 0755, app_loader_template, strmake("%s.so", output_name)); create_file(output_file, 0755, app_loader_template, strmake("%s.so", output_name));