Page MenuHomeFreeBSD
Files F104187013

D1410.id2963.diff
No OneTemporary
Actions

D1410.id2963.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -233,6 +233,7 @@
GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
.endif
+_BOOTSTRAP_MAKEINFO?= ${MK_INFO}
# bootstrap-tools stage
BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${BPATH}:${PATH} \
@@ -247,6 +248,7 @@
SSP_CFLAGS= \
-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
-DNO_PIC -DNO_PROFILE -DNO_SHARED \
+ _BOOTSTRAP_MAKEINFO=${_BOOTSTRAP_MAKEINFO} \
-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS
# build-tools stage
@@ -1309,6 +1311,10 @@
usr.bin/compile_et
.endif
+.if ${_BOOTSTRAP_MAKEINFO} != "no"
+_texinfo= gnu/usr.bin/texinfo/libtxi \
+ gnu/usr.bin/texinfo/makeinfo
+.endif
# Please document (add comment) why something is in 'bootstrap-tools'.
# Try to bound the building of the bootstrap-tool to just the
# FreeBSD versions that need the tool built at this stage of the build.
@@ -1338,6 +1344,7 @@
usr.sbin/config \
${_crunch} \
${_nmtree} \
+ ${_texinfo} \
${_vtfontcvt}
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool} && \
@@ -1358,11 +1365,6 @@
_gcc_tools= gnu/usr.bin/cc/cc_tools
.endif
-.if ${MK_INFO} != "no"
-_texinfo= gnu/usr.bin/texinfo/libtxi \
- gnu/usr.bin/texinfo/makeinfo
-.endif
-
.if ${MK_RESCUE} != "no"
_rescue= rescue/rescue
.endif
@@ -1394,15 +1396,6 @@
${MAKE} DIRPRFX=${_tool}/ depend && \
${MAKE} DIRPRFX=${_tool}/ all
.endfor
-.for _tool in \
- ${_texinfo}
- ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
- cd ${.CURDIR}/${_tool} && \
- ${MAKE} DIRPRFX=${_tool}/ obj && \
- ${MAKE} DIRPRFX=${_tool}/ depend && \
- ${MAKE} DIRPRFX=${_tool}/ all && \
- ${MAKE} DIRPRFX=${_tool}/ install DESTDIR=${WORLDTMP}
-.endfor
#

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 5, 12:36 PM (13 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15056322
Default Alt Text
D1410.id2963.diff (1 KB)

Event Timeline