system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 06:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

winegcc: Don't link directly to ntdll or ntoskrnl import libraries.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-11-17 14:56:38 +01:00
parent b65ef71fc0
commit a7074ea2a3
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tools/winegcc/winegcc.c
View file

@ -1408,18 +1408,28 @@ static void build(struct options* opts)
strarray_add(&link_args, name); strarray_add(&link_args, name);
break; break;
case 'a': case 'a':
if (is_pe && !opts->use_msvcrt && !opts->lib_suffix && strchr(name, '/')) if (!opts->use_msvcrt && !opts->lib_suffix && strchr(name, '/'))
{ {
/* turn the path back into -Ldir -lfoo options /* turn the path back into -Ldir -lfoo options
* this makes sure that we use the specified libs even * this makes sure that we use the specified libs even
* when mingw adds its own import libs to the link */ * when mingw adds its own import libs to the link */
const char *p = get_basename( name ); const char *p = get_basename( name );
if (!strncmp( p, "lib", 3 ) && strcmp( p, "libmsvcrt.a" )) if (is_pe)
{ {
strarray_add(&link_args, strmake("-L%s", get_dirname(name) )); if (!strncmp( p, "lib", 3 ) && strcmp( p, "libmsvcrt.a" ))
strarray_add(&link_args, strmake("-l%s", get_basename_noext( p + 3 ))); {
break; strarray_add(&link_args, strmake("-L%s", get_dirname(name) ));
strarray_add(&link_args, strmake("-l%s", get_basename_noext( p + 3 )));
break;
}
}
else
{
/* don't link to ntdll or ntoskrnl in non-msvcrt mode
* since they export CRT functions */
if (!strcmp( p, "libntdll.a" )) break;
if (!strcmp( p, "libntoskrnl.a" )) break;
} }
} }
strarray_add(&link_args, name); strarray_add(&link_args, name);