diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2015-09-26 04:22:18 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2015-09-26 04:22:18 +0000 |
commit | 77e5381f822cd6726a5a41c6dd5003e8b6c4ac5b (patch) | |
tree | cd2b0bf10a8ec944b43def98a993c439b89a2dae /Makefile.inc1 | |
parent | 54ea4abf6e174211d20dcf6195cf011deba5f970 (diff) | |
download | FreeBSD-src-77e5381f822cd6726a5a41c6dd5003e8b6c4ac5b.zip FreeBSD-src-77e5381f822cd6726a5a41c6dd5003e8b6c4ac5b.tar.gz |
META_MODE: Make it easier to keep the bootstrap-tools args in sync.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 3631610..de1f663 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 \ |