diff options
| author | sjg <sjg@FreeBSD.org> | 2013-09-05 20:18:59 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-09-05 20:18:59 +0000 |
| commit | 62bb1062226d3ce6a2350808256a25508978352d (patch) | |
| tree | 22b131dceb13c3df96da594fbaadb693504797c7 /usr.bin/make | |
| parent | 72ab90509b3a51ab361bf710338f2ef44a4e360d (diff) | |
| parent | 04932445481c2cb89ff69a83b961bdef3d64757e (diff) | |
| download | FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.zip FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.tar.gz | |
Merge from head
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/Makefile | 7 | ||||
| -rw-r--r-- | usr.bin/make/job.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index 5442eaa..4605bb3 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -111,4 +111,11 @@ CFLAGS+= -DDEFSHELLNAME=\"${MAKE_SHELL}\" .error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"." .endif +.if defined(MK_BMAKE) && ${MK_BMAKE} != "no" +# if we are here we don't want this called 'make' +PROG= fmake +fmake.1: make.1 + cp ${.ALLSRC} ${.TARGET} +.endif + .include <bsd.prog.mk> diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index bc1d6a0..6fee0ec 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -2128,7 +2128,7 @@ Job_CatchChildren(Boolean block) } for (;;) { - pid = waitpid((pid_t)-1, &status, + pid = waitpid(-1, &status, (block ? 0 : WNOHANG) | WUNTRACED); if (pid <= 0) break; @@ -2628,7 +2628,7 @@ Job_AbortAll(void) /* * Catch as many children as want to report in at first, then give up */ - while (waitpid((pid_t)-1, &foo, WNOHANG) > 0) + while (waitpid(-1, &foo, WNOHANG) > 0) ; } |
