Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add .MAKE to all targets that use ${MAKEDIRTARGET} otherwise make closes 

the job-token pipe and the sub-makes have their own '-j n' processes.
As well as giving unexpected parallelism, it makes it impossible to stop
the build promptly on errors.
This commit is contained in:
dsl 2006-01-21 19:01:15 +00:00
parent 7db3afd210
commit 0f1b985d1a
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.241 2006/01/04 15:30:02 apb Exp $
# $NetBSD: Makefile,v 1.242 2006/01/21 19:01:15 dsl Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@ -126,7 +126,7 @@ SUBDIR+= ${dir}
.endfor
.if exists(regress)
regression-tests: .PHONY
regression-tests: .PHONY .MAKE
@echo Running regression tests...
${MAKEDIRTARGET} regress regress
.endif
@ -135,7 +135,7 @@ regression-tests: .PHONY
NOPOSTINSTALL= # defined
.endif
afterinstall: .PHONY
afterinstall: .PHONY .MAKE
.if ${MKMAN} != "no"
${MAKEDIRTARGET} share/man makedb
.endif
@ -220,7 +220,7 @@ includes-gnu: .PHONY includes-lib
START_TIME!= date
build: .PHONY
build: .PHONY .MAKE
.if defined(BUILD_DONE)
@echo "Build already installed into ${DESTDIR}"
.else
@ -238,7 +238,7 @@ build: .PHONY
# ${RELEASEDIR}). "buildworld" enforces a build to ${DESTDIR} != /
#
distribution buildworld: .PHONY
distribution buildworld: .PHONY .MAKE
.if make(buildworld) && \
(!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
@echo "Won't make ${.TARGET} with DESTDIR=/"
@ -262,7 +262,7 @@ distribution buildworld: .PHONY
HOST_UNAME_S!= uname -s
HOST_UNAME_M!= uname -m
installworld: .PHONY
installworld: .PHONY .MAKE
.if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/")
@echo "Can't make ${.TARGET} to DESTDIR=/"
@false
@ -289,7 +289,7 @@ installworld: .PHONY
#
.for tgt in sets sourcesets syspkgs
${tgt}: .PHONY
${tgt}: .PHONY .MAKE
${MAKEDIRTARGET} distrib/sets ${tgt}
.endfor
@ -299,7 +299,7 @@ ${tgt}: .PHONY
# are made.
#
release snapshot: .PHONY
release snapshot: .PHONY .MAKE
${MAKEDIRTARGET} . distribution
${MAKEDIRTARGET} etc release DISTRIBUTION_DONE=1
@echo "make ${.TARGET} started at: ${START_TIME}"
@ -320,7 +320,7 @@ check-tools: .PHONY
@echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
.endif
do-distrib-dirs: .PHONY
do-distrib-dirs: .PHONY .MAKE
.if !defined(DESTDIR) || ${DESTDIR} == ""
${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/
.else
@ -333,13 +333,13 @@ do-${targ}: .PHONY ${targ}
.endfor
.for dir in tools tools/compat lib/csu gnu/lib/crtstuff${LIBGCC_EXT} gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib
do-${dir:S/\//-/g}: .PHONY
do-${dir:S/\//-/g}: .PHONY .MAKE
.for targ in dependall install
${MAKEDIRTARGET} ${dir} ${targ}
.endfor
.endfor
do-ld.so: .PHONY
do-ld.so: .PHONY .MAKE
.for targ in dependall install
.if (${OBJECT_FMT} == "a.out")
${MAKEDIRTARGET} libexec/ld.aout_so ${targ}
@ -349,15 +349,15 @@ do-ld.so: .PHONY
.endif
.endfor
do-build: .PHONY
do-build: .PHONY .MAKE
.for targ in dependall install
${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no
.endfor
do-x11: .PHONY
do-x11: .PHONY .MAKE
${MAKEDIRTARGET} x11 build
do-obsolete: .PHONY
do-obsolete: .PHONY .MAKE
${MAKEDIRTARGET} etc install-obsolete-lists
#
@ -395,5 +395,5 @@ ${.CURDIR}/BUILDING: doc/BUILDING.mdoc
#
# Display current make(1) parameters
#
params: .PHONY
params: .PHONY .MAKE
${MAKEDIRTARGET} etc params