From owner-svn-src-all@FreeBSD.ORG  Thu Jul 22 18:57:47 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DF2E11065674;
	Thu, 22 Jul 2010 18:57:47 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CE2058FC12;
	Thu, 22 Jul 2010 18:57:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6MIvlqK033315;
	Thu, 22 Jul 2010 18:57:47 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6MIvldH033313;
	Thu, 22 Jul 2010 18:57:47 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201007221857.o6MIvldH033313@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 22 Jul 2010 18:57:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210387 - head/sys/boot/i386/loader
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jul 2010 18:57:48 -0000

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>