MFC r291605:
Fix errors being ignored in many phases of the build since the bmake integration.
This commit is contained in:
bdrewery
parent
53dd77f04a
commit
4d3c809df9
14
Makefile
14
Makefile
@ -366,21 +366,21 @@ make bmake: .PHONY
|
||||
@echo ">>> Building an up-to-date make(1)"
|
||||
@echo "--------------------------------------------------------------"
|
||||
${_+_}@cd ${.CURDIR}/usr.bin/${.TARGET}; \
|
||||
${MMAKE} obj && \
|
||||
${MMAKE} depend && \
|
||||
${MMAKE} all && \
|
||||
${MMAKE} obj; \
|
||||
${MMAKE} depend; \
|
||||
${MMAKE} all; \
|
||||
${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR=
|
||||
|
||||
tinderbox toolchains kernel-toolchains: upgrade_checks
|
||||
|
||||
tinderbox:
|
||||
@cd ${.CURDIR} && ${SUB_MAKE} DOING_TINDERBOX=YES universe
|
||||
@cd ${.CURDIR}; ${SUB_MAKE} DOING_TINDERBOX=YES universe
|
||||
|
||||
toolchains:
|
||||
@cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=toolchain universe
|
||||
@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=toolchain universe
|
||||
|
||||
kernel-toolchains:
|
||||
@cd ${.CURDIR} && ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe
|
||||
@cd ${.CURDIR}; ${SUB_MAKE} UNIVERSE_TARGET=kernel-toolchain universe
|
||||
|
||||
#
|
||||
# universe
|
||||
@ -467,7 +467,7 @@ universe_${target}_kernels: universe_${target}_prologue .MAKE
|
||||
(echo "${target} 'make LINT' failed," \
|
||||
"check _.${target}.makeLINT for details"| ${MAKEFAIL}))
|
||||
.endif
|
||||
@cd ${.CURDIR} && ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \
|
||||
@cd ${.CURDIR}; ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \
|
||||
universe_kernels
|
||||
.endif
|
||||
@echo ">> ${target} completed on `LC_ALL=C date`"
|
||||
|
||||
@ -1167,7 +1167,7 @@ doxygen: .PHONY
|
||||
echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \
|
||||
exit 1; \
|
||||
fi
|
||||
${_+_}cd ${.CURDIR}/tools/kerneldoc/subsys && ${MAKE} obj all
|
||||
${_+_}cd ${.CURDIR}/tools/kerneldoc/subsys; ${MAKE} obj all
|
||||
|
||||
#
|
||||
# update
|
||||
@ -1187,7 +1187,7 @@ update:
|
||||
@echo "--------------------------------------------------------------"
|
||||
@echo ">>> Updating ${.CURDIR} using Subversion"
|
||||
@echo "--------------------------------------------------------------"
|
||||
@(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS})
|
||||
@(cd ${.CURDIR}; ${SVN} update ${SVNFLAGS})
|
||||
.endif
|
||||
|
||||
#
|
||||
@ -1211,11 +1211,11 @@ legacy:
|
||||
.endif
|
||||
.for _tool in tools/build
|
||||
${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
|
||||
cd ${.CURDIR}/${_tool} && \
|
||||
${MAKE} DIRPRFX=${_tool}/ obj && \
|
||||
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes && \
|
||||
${MAKE} DIRPRFX=${_tool}/ depend && \
|
||||
${MAKE} DIRPRFX=${_tool}/ all && \
|
||||
cd ${.CURDIR}/${_tool}; \
|
||||
${MAKE} DIRPRFX=${_tool}/ obj; \
|
||||
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \
|
||||
${MAKE} DIRPRFX=${_tool}/ depend; \
|
||||
${MAKE} DIRPRFX=${_tool}/ all; \
|
||||
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
|
||||
.endfor
|
||||
|
||||
@ -1379,10 +1379,10 @@ bootstrap-tools: .PHONY
|
||||
${_vtfontcvt}
|
||||
${_bt}-${_tool}: .PHONY .MAKE
|
||||
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
|
||||
cd ${.CURDIR}/${_tool} && \
|
||||
${MAKE} DIRPRFX=${_tool}/ obj && \
|
||||
${MAKE} DIRPRFX=${_tool}/ depend && \
|
||||
${MAKE} DIRPRFX=${_tool}/ all && \
|
||||
cd ${.CURDIR}/${_tool}; \
|
||||
${MAKE} DIRPRFX=${_tool}/ obj; \
|
||||
${MAKE} DIRPRFX=${_tool}/ depend; \
|
||||
${MAKE} DIRPRFX=${_tool}/ all; \
|
||||
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
|
||||
|
||||
bootstrap-tools: ${_bt}-${_tool}
|
||||
@ -1418,16 +1418,16 @@ build-tools: .MAKE
|
||||
usr.bin/mkcsmapper_static \
|
||||
usr.bin/vi/catalog
|
||||
${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \
|
||||
cd ${.CURDIR}/${_tool} && \
|
||||
${MAKE} DIRPRFX=${_tool}/ obj && \
|
||||
cd ${.CURDIR}/${_tool}; \
|
||||
${MAKE} DIRPRFX=${_tool}/ obj; \
|
||||
${MAKE} DIRPRFX=${_tool}/ build-tools
|
||||
.endfor
|
||||
.for _tool in \
|
||||
${_gcc_tools}
|
||||
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
|
||||
cd ${.CURDIR}/${_tool} && \
|
||||
${MAKE} DIRPRFX=${_tool}/ obj && \
|
||||
${MAKE} DIRPRFX=${_tool}/ depend && \
|
||||
cd ${.CURDIR}/${_tool}; \
|
||||
${MAKE} DIRPRFX=${_tool}/ obj; \
|
||||
${MAKE} DIRPRFX=${_tool}/ depend; \
|
||||
${MAKE} DIRPRFX=${_tool}/ all
|
||||
.endfor
|
||||
|
||||
@ -1491,10 +1491,10 @@ cross-tools: .MAKE .PHONY
|
||||
${_crunchide} \
|
||||
${_kgzip}
|
||||
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
|
||||
cd ${.CURDIR}/${_tool} && \
|
||||
${MAKE} DIRPRFX=${_tool}/ obj && \
|
||||
${MAKE} DIRPRFX=${_tool}/ depend && \
|
||||
${MAKE} DIRPRFX=${_tool}/ all && \
|
||||
cd ${.CURDIR}/${_tool}; \
|
||||
${MAKE} DIRPRFX=${_tool}/ obj; \
|
||||
${MAKE} DIRPRFX=${_tool}/ depend; \
|
||||
${MAKE} DIRPRFX=${_tool}/ all; \
|
||||
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
|
||||
.endfor
|
||||
|
||||
@ -1579,10 +1579,10 @@ native-xtools: .PHONY
|
||||
usr.bin/yacc \
|
||||
usr.sbin/chown
|
||||
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
|
||||
cd ${.CURDIR}/${_tool} && \
|
||||
${NXBMAKE} DIRPRFX=${_tool}/ obj && \
|
||||
${NXBMAKE} DIRPRFX=${_tool}/ depend && \
|
||||
${NXBMAKE} DIRPRFX=${_tool}/ all && \
|
||||
cd ${.CURDIR}/${_tool}; \
|
||||
${NXBMAKE} DIRPRFX=${_tool}/ obj; \
|
||||
${NXBMAKE} DIRPRFX=${_tool}/ depend; \
|
||||
${NXBMAKE} DIRPRFX=${_tool}/ all; \
|
||||
${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${OBJTREE}/nxb-bin install
|
||||
.endfor
|
||||
|
||||
@ -1590,7 +1590,7 @@ native-xtools: .PHONY
|
||||
# hierarchy - ensure that all the needed directories are present
|
||||
#
|
||||
hierarchy hier: .MAKE .PHONY
|
||||
${_+_}cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs
|
||||
${_+_}cd ${.CURDIR}/etc; ${HMAKE} distrib-dirs
|
||||
|
||||
#
|
||||
# libraries - build all libraries, and install them under ${DESTDIR}.
|
||||
@ -1600,10 +1600,10 @@ hierarchy hier: .MAKE .PHONY
|
||||
# ${.CURDIR}/tools/make_libdeps.sh script.
|
||||
#
|
||||
libraries: .MAKE .PHONY
|
||||
${_+_}cd ${.CURDIR} && \
|
||||
${MAKE} -f Makefile.inc1 _prereq_libs && \
|
||||
${MAKE} -f Makefile.inc1 _startup_libs && \
|
||||
${MAKE} -f Makefile.inc1 _prebuild_libs && \
|
||||
${_+_}cd ${.CURDIR}; \
|
||||
${MAKE} -f Makefile.inc1 _prereq_libs; \
|
||||
${MAKE} -f Makefile.inc1 _startup_libs; \
|
||||
${MAKE} -f Makefile.inc1 _prebuild_libs; \
|
||||
${MAKE} -f Makefile.inc1 _generic_libs
|
||||
|
||||
#
|
||||
@ -1805,11 +1805,11 @@ gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L
|
||||
${_lib}__PL: .PHONY .MAKE
|
||||
.if exists(${.CURDIR}/${_lib})
|
||||
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
|
||||
cd ${.CURDIR}/${_lib} && \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
|
||||
cd ${.CURDIR}/${_lib}; \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj; \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend; \
|
||||
${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
|
||||
DIRPRFX=${_lib}/ all && \
|
||||
DIRPRFX=${_lib}/ all; \
|
||||
${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
|
||||
DIRPRFX=${_lib}/ install
|
||||
.endif
|
||||
@ -1819,10 +1819,10 @@ ${_lib}__PL: .PHONY .MAKE
|
||||
${_lib}__L: .PHONY .MAKE
|
||||
.if exists(${.CURDIR}/${_lib})
|
||||
${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
|
||||
cd ${.CURDIR}/${_lib} && \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ all && \
|
||||
cd ${.CURDIR}/${_lib}; \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj; \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend; \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ all; \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ install
|
||||
.endif
|
||||
.endfor
|
||||
@ -1832,11 +1832,11 @@ ${_lib}__L: .PHONY .MAKE
|
||||
# modules.
|
||||
lib/libpam__L: .PHONY .MAKE
|
||||
${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
|
||||
cd ${.CURDIR}/lib/libpam && \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ obj && \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ depend && \
|
||||
cd ${.CURDIR}/lib/libpam; \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ obj; \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ depend; \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
|
||||
-D_NO_LIBPAM_SO_YET all && \
|
||||
-D_NO_LIBPAM_SO_YET all; \
|
||||
${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
|
||||
-D_NO_LIBPAM_SO_YET install
|
||||
|
||||
@ -2108,10 +2108,10 @@ _xb-bootstrap-tools: .PHONY
|
||||
.for _tool in \
|
||||
${_clang_tblgen}
|
||||
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
|
||||
cd ${.CURDIR}/${_tool} && \
|
||||
${CDMAKE} DIRPRFX=${_tool}/ obj && \
|
||||
${CDMAKE} DIRPRFX=${_tool}/ depend && \
|
||||
${CDMAKE} DIRPRFX=${_tool}/ all && \
|
||||
cd ${.CURDIR}/${_tool}; \
|
||||
${CDMAKE} DIRPRFX=${_tool}/ obj; \
|
||||
${CDMAKE} DIRPRFX=${_tool}/ depend; \
|
||||
${CDMAKE} DIRPRFX=${_tool}/ all; \
|
||||
${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install
|
||||
.endfor
|
||||
|
||||
@ -2127,9 +2127,9 @@ _xb-cross-tools: .PHONY
|
||||
${_clang} \
|
||||
${_cc}
|
||||
${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \
|
||||
cd ${.CURDIR}/${_tool} && \
|
||||
${CDMAKE} DIRPRFX=${_tool}/ obj && \
|
||||
${CDMAKE} DIRPRFX=${_tool}/ depend && \
|
||||
cd ${.CURDIR}/${_tool}; \
|
||||
${CDMAKE} DIRPRFX=${_tool}/ obj; \
|
||||
${CDMAKE} DIRPRFX=${_tool}/ depend; \
|
||||
${CDMAKE} DIRPRFX=${_tool}/ all
|
||||
.endfor
|
||||
|
||||
|
||||
8
UPDATING
8
UPDATING
@ -400,14 +400,6 @@ older version of current is a bit fragile.
|
||||
keep 64-bits counters. Thus all tools, that work with networking
|
||||
statistics, must be rebuilt (netstat(1), bsnmpd(1), etc.)
|
||||
|
||||
20130629:
|
||||
Fix targets that run multiple make's to use && rather than ;
|
||||
so that subsequent steps depend on success of previous.
|
||||
|
||||
NOTE: if building 'universe' with -j* on stable/8 or stable/9
|
||||
it would be better to start the build using bmake, to avoid
|
||||
overloading the machine.
|
||||
|
||||
20130618:
|
||||
Fix a bug that allowed a tracing process (e.g. gdb) to write
|
||||
to a memory-mapped file in the traced process's address space
|
||||
|
||||
Loading…
Reference in New Issue
Block a user