svn commit: r288251 - in head: . targets/pseudo/bootstrap-tools
Bryan Drewery
bdrewery at FreeBSD.org
Sat Sep 26 04:22:20 UTC 2015
Author: bdrewery
Date: Sat Sep 26 04:22:18 2015
New Revision: 288251
URL: https://svnweb.freebsd.org/changeset/base/288251
Log:
META_MODE: Make it easier to keep the bootstrap-tools args in sync.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/Makefile.inc1
head/targets/pseudo/bootstrap-tools/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Sat Sep 26 03:51:53 2015 (r288250)
+++ head/Makefile.inc1 Sat Sep 26 04:22:18 2015 (r288251)
@@ -257,9 +257,8 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/i
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 \
Modified: head/targets/pseudo/bootstrap-tools/Makefile
==============================================================================
--- head/targets/pseudo/bootstrap-tools/Makefile Sat Sep 26 03:51:53 2015 (r288250)
+++ head/targets/pseudo/bootstrap-tools/Makefile Sat Sep 26 04:22:18 2015 (r288251)
@@ -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}
More information about the svn-src-head
mailing list