Commit c11da76d authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard

winegcc: Add support for Multiarch Architecture Specifiers.

parent 504925a8
...@@ -361,7 +361,7 @@ static char *get_lib_dir( struct options *opts ) ...@@ -361,7 +361,7 @@ static char *get_lib_dir( struct options *opts )
for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++)
{ {
char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen(libwine) + 3 ); char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 );
strcpy( buffer, stdlibpath[i] ); strcpy( buffer, stdlibpath[i] );
p = buffer + strlen(buffer); p = buffer + strlen(buffer);
while (p > buffer && p[-1] == '/') p--; while (p > buffer && p[-1] == '/') p--;
...@@ -380,6 +380,18 @@ static char *get_lib_dir( struct options *opts ) ...@@ -380,6 +380,18 @@ static char *get_lib_dir( struct options *opts )
strcat( p, libwine ); strcat( p, libwine );
if (check_platform( opts, buffer )) goto found; if (check_platform( opts, buffer )) goto found;
} }
switch(opts->target_cpu)
{
case CPU_x86: strcpy( p, "/i386-linux-gnu" ); break;
case CPU_x86_64: strcpy( p, "/x86_64-linux-gnu" ); break;
case CPU_ARM: strcpy( p, "/arm-linux-gnueabi" ); break;
case CPU_ARM64: strcpy( p, "/aarch64-linux-gnu" ); break;
case CPU_POWERPC: strcpy( p, "/powerpc-linux-gnu" ); break;
default:
assert(0);
}
strcat( p, libwine );
if (check_platform( opts, buffer )) goto found;
free( buffer ); free( buffer );
continue; continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment