PATCH: LD in winegcc
Marcus Meissner
meissner at suse.de
Sat Jul 24 14:12:42 CDT 2004
Hi,
Helps for compiling on AMD64, just export LD="ld -m elf_i386" during make and
LD="ld -m elf_i386" CC="gcc -m32" AS="gcc -m32 -c" \
./configure --prefix=/usr --x-libraries=/usr/X11R6/lib
for configure.
Ciao, Marcus
Changelog:
Use "LD" instead of "ld" in winebuild to be able to use a different
ld or ld options.
diff -ruN -x CVS wine-20040716/tools/winebuild/import.c marcus-wine-20040716/tools/winebuild/import.c
--- wine-20040716/tools/winebuild/import.c 2004-07-19 04:07:51.000000000 -0700
+++ marcus-wine-20040716/tools/winebuild/import.c 2004-07-19 04:14:25.000000000 -0700
@@ -512,7 +512,7 @@
static const char *ldcombine_files( char **argv )
{
int i, len = 0;
- char *cmd;
+ char *cmd, *ldcmd;
int fd, err;
if (output_file_name && output_file_name[0])
@@ -527,9 +527,11 @@
close( fd );
atexit( remove_ld_tmp_file );
+ ldcmd = getenv("LD");
+ if (!ldcmd) ldcmd="ld";
for (i = 0; argv[i]; i++) len += strlen(argv[i]) + 1;
- cmd = xmalloc( len + strlen(ld_tmp_file) + 10 );
- sprintf( cmd, "ld -r -o %s", ld_tmp_file );
+ cmd = xmalloc( len + strlen(ld_tmp_file) + 10 + strlen(ldcmd) );
+ sprintf( cmd, "%s -r -o %s", ldcmd, ld_tmp_file );
for (i = 0; argv[i]; i++) sprintf( cmd + strlen(cmd), " %s", argv[i] );
err = system( cmd );
if (err) fatal_error( "ld -r failed with status %d\n", err );
More information about the wine-patches
mailing list