From owner-svn-src-projects@FreeBSD.ORG  Tue Nov 24 21:04:24 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4CCFC106566C;
	Tue, 24 Nov 2009 21:04:24 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3C5B78FC08;
	Tue, 24 Nov 2009 21:04:24 +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 nAOL4Oaq029488;
	Tue, 24 Nov 2009 21:04:24 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOL4OIl029486;
	Tue, 24 Nov 2009 21:04:24 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200911242104.nAOL4OIl029486@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 24 Nov 2009 21:04:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199766 - projects/clangbsd
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2009 21:04:24 -0000

Author: rdivacky
Date: Tue Nov 24 21:04:23 2009
New Revision: 199766
URL: http://svn.freebsd.org/changeset/base/199766

Log:
  use -B for the crt* stuff and link /usr/bin from $WORLTMP
  to get the real ones.

Modified:
  projects/clangbsd/Makefile.inc1

Modified: projects/clangbsd/Makefile.inc1
==============================================================================
--- projects/clangbsd/Makefile.inc1	Tue Nov 24 20:04:31 2009	(r199765)
+++ projects/clangbsd/Makefile.inc1	Tue Nov 24 21:04:23 2009	(r199766)
@@ -277,7 +277,7 @@ LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
 LIB32FLAGS=	-m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \
 		-isystem ${LIB32TMP}/usr/include/ \
 		-L${LIB32TMP}/usr/lib32 \
-		-B${LIB32TMP}/usr/lib32
+		-B${LIB32TMP}
 
 # Yes, the flags are redundant.
 LIB32WMAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
@@ -442,6 +442,10 @@ build32:
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${LIB32TMP}/usr/include >/dev/null
 	mkdir -p ${WORLDTMP}
+	# relink /usr/bin to the lib32 tmp so the -B can pick up
+	# the /usr/bin/ld and /usr/bin/as
+	rm -rf ${LIB32TMP}/usr/bin/
+	ln -sf ${WORLDTMP}/usr/bin/ ${LIB32TMP}/usr/bin
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
 .if ${MK_KERBEROS} != "no"
 .for _t in obj depend all