Hi,
Sometimes (like when biarch crosscompiling), you need $LD set to something other
than "ld". The Makefiles already cope, just winebuild does not get it right.
This patch fixes the problem.
Ciao, Marcus
Changelog:
pass $LD to winebuild too, in case we need a different LD.
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.122
diff -u -r1.122 configure.ac
--- configure.ac 15 Jan 2003 00:50:48 -0000 1.122
+++ configure.ac 16 Jan 2003 14:41:52 -0000
@@ -848,9 +848,9 @@
case $build_os in
cygwin*|mingw32*)
- AC_SUBST(LDPATH,"PATH=\"\$(TOOLSDIR)/library:\$(TOOLSDIR)/unicode:\$\$PATH\"") ;;
+ AC_SUBST(LDPATH,"LD=\"\$(LD)\" PATH=\"\$(TOOLSDIR)/library:\$(TOOLSDIR)/unicode:\$\$PATH\"") ;;
*)
- AC_SUBST(LDPATH,"LD_LIBRARY_PATH=\"\$(TOOLSDIR)/library:\$(TOOLSDIR)/unicode:\$\$LD_LIBRARY_PATH\"") ;;
+ AC_SUBST(LDPATH,"LD=\"\$(LD)\" LD_LIBRARY_PATH=\"\$(TOOLSDIR)/library:\$(TOOLSDIR)/unicode:\$\$LD_LIBRARY_PATH\"") ;;
esac
dnl Mingw needs explicit msvcrt for linking libwine
Index: tools/winebuild/import.c
===================================================================
RCS file: /home/wine/wine/tools/winebuild/import.c,v
retrieving revision 1.45
diff -u -r1.45 import.c
--- tools/winebuild/import.c 20 Dec 2002 00:36:18 -0000 1.45
+++ tools/winebuild/import.c 16 Jan 2003 14:42:23 -0000
@@ -569,7 +569,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])
@@ -584,9 +584,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 );
