aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2015-09-26 04:22:18 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2015-09-26 04:22:18 +0000
commit3cad5c68de59b83849a249f49a4ac53c37cc53c7 (patch)
treecd2b0bf10a8ec944b43def98a993c439b89a2dae
parent6a8077f3d56c2793f2cd895ec08436a99bdc5ef6 (diff)
downloadsrc-3cad5c68de59b83849a249f49a4ac53c37cc53c7.tar.gz
src-3cad5c68de59b83849a249f49a4ac53c37cc53c7.zip
META_MODE: Make it easier to keep the bootstrap-tools args in sync.
Sponsored by: EMC / Isilon Storage Division
Notes
Notes: svn path=/head/; revision=288251
-rw-r--r--Makefile.inc19
-rw-r--r--targets/pseudo/bootstrap-tools/Makefile20
2 files changed, 15 insertions, 14 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 3631610e4dd3..de1f6631dedb 100644
--- a/Makefile.inc1
+++ b/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} \
- ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
- DESTDIR= \
+# need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile
+BSARGS= 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 \
diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile
index a267e9573498..1b0ebde783fe 100644
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -31,17 +31,15 @@ OSRELDATE?= 0
.endif
# need to keep this in sync with src/Makefile.inc1
-BSARGS= \
- DESTDIR= \
- BOOTSTRAPPING=${OSRELDATE} \
- SSP_CFLAGS= \
- MK_HTML=no NO_LINT=yes MK_MAN=no \
- -DNO_PIC MK_PROFILE=no -DNO_SHARED \
- -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
- MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
- MK_LLDB=no MK_TESTS=no \
- MK_INCLUDES=yes
-
+BSARGS= DESTDIR= \
+ BOOTSTRAPPING=${OSRELDATE} \
+ SSP_CFLAGS= \
+ MK_HTML=no NO_LINT=yes MK_MAN=no \
+ -DNO_PIC MK_PROFILE=no -DNO_SHARED \
+ -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
+ MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
+ MK_LLDB=no MK_TESTS=no \
+ MK_INCLUDES=yes
legacy: .MAKE .META
mkdir -p ${LEGACY_TOOLS}