d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2015-09-26 04:22:18 +00:00
parent 6a8077f3d5
commit 3cad5c68de
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.inc1
View File

@ -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 \

4
targets/pseudo/bootstrap-tools/Makefile
View File

@ -31,8 +31,7 @@ OSRELDATE?= 0
.endif
# need to keep this in sync with src/Makefile.inc1
BSARGS= \
DESTDIR= \
BSARGS= DESTDIR= \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
MK_HTML=no NO_LINT=yes MK_MAN=no \
@ -42,7 +41,6 @@ BSARGS= \
MK_LLDB=no MK_TESTS=no \
MK_INCLUDES=yes
legacy: .MAKE .META
mkdir -p ${LEGACY_TOOLS}
${MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${BTOOLSDIR} > $@2