META_MODE: Make it easier to keep the bootstrap-tools args in sync.

Sponsored by:	EMC / Isilon Storage Division

Makefile.inc1

@@ -257,9 +257,8 @@ BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		WORLDTMP=${WORLDTMP} \
 		VERSION="${VERSION}" \
 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
-BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
+# need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile
-		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+BSARGS= 	DESTDIR= \
-		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		MK_HTML=no NO_LINT=yes MK_MAN=no \
@@ -269,6 +268,10 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		MK_LLDB=no MK_TESTS=no \
 		MK_INCLUDES=yes
 
+BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
+		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+		${BSARGS}
+
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \

targets/pseudo/bootstrap-tools/Makefile

@@ -31,17 +31,15 @@ OSRELDATE?= 0
 .endif
 
 # need to keep this in sync with src/Makefile.inc1 
-BSARGS= \
+BSARGS= 	DESTDIR= \
-	DESTDIR= \
+		BOOTSTRAPPING=${OSRELDATE} \
-	BOOTSTRAPPING=${OSRELDATE} \
+		SSP_CFLAGS= \
-	SSP_CFLAGS= \
+		MK_HTML=no NO_LINT=yes MK_MAN=no \
-	MK_HTML=no NO_LINT=yes MK_MAN=no \
+		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
-	-DNO_PIC MK_PROFILE=no -DNO_SHARED \
+		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
-	-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
+		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
-	MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
+		MK_LLDB=no MK_TESTS=no \
-	MK_LLDB=no MK_TESTS=no \
+		MK_INCLUDES=yes
-	MK_INCLUDES=yes 
-
 
 legacy: .MAKE .META
 	mkdir -p ${LEGACY_TOOLS}