svn commit: r199766 - projects/clangbsd

[Roman Divacky]

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