Make sure legacy stuff comes last. Some tools that use

legacy stuff (binutils) depend on this order.

For this to work, provide (and use) specialized versions
of bsd.prog.mk and bsd.lib.mk that include the standard
versions first, then augment CFLAGS, DPADD, LDADD, and
LDFLAGS as necessary, with the legacy stuff.

Tested on:	4.0-RELEASE

Makefile.inc1

@@ -193,9 +193,8 @@ CROSSENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
 # bootstrap-tools stage
 BMAKEENV=	DESTDIR= \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
-		__MAKE_CONF=${.CURDIR}/tools/build/Makefile.boot \
-		OLD_MAKE_CONF=${__MAKE_CONF} \
-		WORLDTMP=${WORLDTMP}
+		WORLDTMP=${WORLDTMP} \
+		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
 BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		BOOTSTRAPPING=${OSRELDATE} \

tools/build/mk/Makefile.boot

@@ -3,18 +3,12 @@
 # FreeBSD didn't always have the __FBSDID() macro in <sys/cdefs.h>.
 # We could do this with a sys/cdefs.h wrapper, but given that this would
 # slow down all new builds for such a simple concept, we do it here.
-.if defined(BOOTSTRAPPING) && \
-    ( ${BOOTSTRAPPING} < 440001 || \
+.if ( ${BOOTSTRAPPING} < 440001 || \
     ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500024 ))
 CFLAGS+=	-D__FBSDID=__RCSID
 .endif
 
 CFLAGS+=	-I${WORLDTMP}/legacy/usr/include
-DPADD=		${WORLDTMP}/legacy/usr/lib/libegacy.a
-LDADD=		-legacy
-LDFLAGS=	-L${WORLDTMP}/legacy/usr/lib
-
-OLD_MAKE_CONF?=	/etc/make.conf
-.if exists(${OLD_MAKE_CONF})
-.include "${OLD_MAKE_CONF}"
-.endif
+DPADD+=		${WORLDTMP}/legacy/usr/lib/libegacy.a
+LDADD+=		-legacy
+LDFLAGS+=	-L${WORLDTMP}/legacy/usr/lib

tools/build/mk/bsd.lib.mk

@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+.include "../../../share/mk/bsd.lib.mk"
+.include "Makefile.boot"

tools/build/mk/bsd.prog.mk

@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+.include "../../../share/mk/bsd.prog.mk"
+.include "Makefile.boot"