svn commit: r210387 - head/sys/boot/i386/loader

[Rui Paulo]

Author: rpaulo
Date: Thu Jul 22 18:57:47 2010
New Revision: 210387
URL: http://svn.freebsd.org/changeset/base/210387

Log:
  Correctly setup LDADD with regards to libstand. The submitter points
  out that "on amd64, libstand.a is compiled for i386, but is still installed
  under ${WORLDTMP}/usr/lib instead of ${WORLDTMP}/usr/lib32.  Even if it
  would be installed there, ld on amd64 is set up incorrectly with a
  ${TOOLS_PREFIX}/usr/lib/i386 default path, so it wouldn't link.  The reason
  it does link under gcc is that gcc passes -L${WORLDTMP}/usr/lib twice,
  even for -m32 builds, which is also incorrect, but accidentally works in
  this case."
  
  Submitted by:	Dimitry Andric <dimitry at andric.com>

Modified:
  head/sys/boot/i386/loader/Makefile

Modified: head/sys/boot/i386/loader/Makefile
==============================================================================
--- head/sys/boot/i386/loader/Makefile	Thu Jul 22 18:52:29 2010	(r210386)
+++ head/sys/boot/i386/loader/Makefile	Thu Jul 22 18:57:47 2010	(r210387)
@@ -115,7 +115,7 @@ FILES+=	loader.rc
 OBJS=	${BTXCRT} 
 
 DPADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} ${LIBSTAND}
-LDADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} -lstand
+LDADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} ${LIBSTAND}
 
 .include <bsd.prog.mk>