Author: bdrewery
Date: Mon May 9 22:21:09 2016
New Revision: 299289
URL: https://svnweb.freebsd.org/changeset/base/299289
Log:
DIRDEPS_BUILD: Run the staged bootstrap-tools version of build-tools.
This avoids running target binaries.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/bin/csh/Makefile
head/bin/sh/Makefile
head/contrib/ncurses/ncurses/tinfo/MKcaptab.sh
head/lib/libmagic/Makefile
head/lib/ncurses/ncurses/Makefile
head/share/mk/local.meta.sys.mk
head/share/syscons/scrnmaps/Makefile
head/usr.bin/awk/Makefile
head/usr.bin/vi/catalog/Makefile
Modified: head/bin/csh/Makefile
==============================================================================
--- head/bin/csh/Makefile Mon May 9 20:55:35 2016 (r299288)
+++ head/bin/csh/Makefile Mon May 9 22:21:09 2016 (r299289)
@@ -118,7 +118,7 @@ gethost: gethost.c sh.err.h tc.const.h s
tc.defs.c: gethost ${TCSHDIR}/host.defs
@rm -f ${.TARGET}
@echo "/* Do not edit this file, make creates it */" > ${.TARGET}
- ./gethost ${TCSHDIR}/host.defs >> ${.TARGET}
+ ${BTOOLSPATH:U.}/gethost ${TCSHDIR}/host.defs >> ${.TARGET}
ed.defns.h: ed.defns.c
@rm -f ${.TARGET}
Modified: head/bin/sh/Makefile
==============================================================================
--- head/bin/sh/Makefile Mon May 9 20:55:35 2016 (r299288)
+++ head/bin/sh/Makefile Mon May 9 22:21:09 2016 (r299289)
@@ -52,11 +52,11 @@ mksyntax: mksyntax.o ${BUILD_TOOLS_META}
.ORDER: nodes.c nodes.h
nodes.c nodes.h: mknodes nodetypes nodes.c.pat
- ./mknodes ${.CURDIR}/nodetypes ${.CURDIR}/nodes.c.pat
+ ${BTOOLSPATH:U.}/mknodes ${.CURDIR}/nodetypes ${.CURDIR}/nodes.c.pat
.ORDER: syntax.c syntax.h
syntax.c syntax.h: mksyntax
- ./mksyntax
+ ${BTOOLSPATH:U.}/mksyntax
token.h: mktokens
sh ${.CURDIR}/mktokens
Modified: head/contrib/ncurses/ncurses/tinfo/MKcaptab.sh
==============================================================================
--- head/contrib/ncurses/ncurses/tinfo/MKcaptab.sh Mon May 9 20:55:35
2016 (r299288)
+++ head/contrib/ncurses/ncurses/tinfo/MKcaptab.sh Mon May 9 22:21:09
2016 (r299289)
@@ -52,8 +52,8 @@ cat <<'EOF'
EOF
-./make_hash 1 info $OPT1 <$DATA
-./make_hash 3 cap $OPT1 <$DATA
+make_hash 1 info $OPT1 <$DATA
+make_hash 3 cap $OPT1 <$DATA
$AWK -f $OPT2 bigstrings=$OPT1 tablename=capalias <$DATA
Modified: head/lib/libmagic/Makefile
==============================================================================
--- head/lib/libmagic/Makefile Mon May 9 20:55:35 2016 (r299288)
+++ head/lib/libmagic/Makefile Mon May 9 22:21:09 2016 (r299289)
@@ -36,7 +36,7 @@ magic: ${MAGFILES}
cat ${.ALLSRC:O} > ${.TARGET}
magic.mgc: mkmagic magic
- ./mkmagic magic
+ ${BTOOLSPATH:U.}/mkmagic magic
CLEANFILES+= mkmagic
build-tools: mkmagic
Modified: head/lib/ncurses/ncurses/Makefile
==============================================================================
--- head/lib/ncurses/ncurses/Makefile Mon May 9 20:55:35 2016
(r299288)
+++ head/lib/ncurses/ncurses/Makefile Mon May 9 22:21:09 2016
(r299289)
@@ -342,7 +342,7 @@ unctrl.c: MKunctrl.awk
echo | ${AWK} -f ${NCURSES_DIR}/ncurses/base/MKunctrl.awk
bigstrings=${USE_BIG_STRINGS} > unctrl.c
comp_captab.c: MKcaptab.sh MKcaptab.awk Caps make_hash
- sh ${NCURSES_DIR}/ncurses/tinfo/MKcaptab.sh "${AWK}" \
+ env PATH=${BTOOLSPATH:U.}:${PATH} sh
${NCURSES_DIR}/ncurses/tinfo/MKcaptab.sh "${AWK}" \
${USE_BIG_STRINGS} ${NCURSES_DIR}/ncurses/tinfo/MKcaptab.awk \
${NCURSES_DIR}/include/Caps > comp_captab.c
@@ -358,7 +358,7 @@ nomacros.h: MKlib_gen.sh curses.h
"${AWK}" generated < curses.h | fgrep undef > $@
init_keytry.h: keys.list make_keys
- ./make_keys keys.list > init_keytry.h
+ ${BTOOLSPATH:U.}/make_keys keys.list > init_keytry.h
hashsize.h: MKhashsize.sh Caps
sh ${NCURSES_DIR}/include/MKhashsize.sh ${NCURSES_DIR}/include/Caps > $@
Modified: head/share/mk/local.meta.sys.mk
==============================================================================
--- head/share/mk/local.meta.sys.mk Mon May 9 20:55:35 2016
(r299288)
+++ head/share/mk/local.meta.sys.mk Mon May 9 22:21:09 2016
(r299289)
@@ -232,6 +232,8 @@ TOOLSDIR?= ${HOST_OBJTOP}/tools
.elif defined(STAGE_HOST_OBJTOP)
TOOLSDIR?= ${STAGE_HOST_OBJTOP}
.endif
+BTOOLSPATH= ${HOST_OBJTOP}/tools${.CURDIR}
+
# Don't use the bootstrap tools logic on itself.
.if ${.TARGETS:Mbootstrap-tools} == "" && \
!make(showconfig) && \
Modified: head/share/syscons/scrnmaps/Makefile
==============================================================================
--- head/share/syscons/scrnmaps/Makefile Mon May 9 20:55:35 2016
(r299288)
+++ head/share/syscons/scrnmaps/Makefile Mon May 9 22:21:09 2016
(r299289)
@@ -15,7 +15,7 @@ FILESDIR= ${SHAREDIR}/syscons/scrnmaps
build-tools: ${SCRMAPS_MK}
${SCRMAPS}: ${.TARGET:R}.mk
- ./${.TARGET:R}.mk ${.TARGET:R}.tmp
+ ${BTOOLSPATH:U.}/${.TARGET:R}.mk ${.TARGET:R}.tmp
uuencode ${.TARGET:R}.tmp ${.TARGET:R} > ${.TARGET}
rm -f ${.TARGET:R}.tmp
Modified: head/usr.bin/awk/Makefile
==============================================================================
--- head/usr.bin/awk/Makefile Mon May 9 20:55:35 2016 (r299288)
+++ head/usr.bin/awk/Makefile Mon May 9 22:21:09 2016 (r299289)
@@ -21,7 +21,7 @@ ytab.h: awkgram.h .NOMETA
ln -sf ${.ALLSRC} ${.TARGET}
proctab.c: maketab
- ./maketab > proctab.c
+ ${BTOOLSPATH:U.}/maketab > proctab.c
build-tools: maketab
maketab: ytab.h ${AWKSRC}/maketab.c ${BUILD_TOOLS_META}
Modified: head/usr.bin/vi/catalog/Makefile
==============================================================================
--- head/usr.bin/vi/catalog/Makefile Mon May 9 20:55:35 2016
(r299288)
+++ head/usr.bin/vi/catalog/Makefile Mon May 9 22:21:09 2016
(r299289)
@@ -98,7 +98,7 @@ ${c}.check: ${c}.base
.endfor
english.base: dump ${SCAN} #Makefile
- ./dump ${SCAN} |\
+ ${BTOOLSPATH:U.}/dump ${SCAN} |\
sed -e '/|/!d' \
-e 's/|/ "/' \
-e 's/^"//' |\
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
