diff options
| author | sjg <sjg@FreeBSD.org> | 2012-11-16 01:37:25 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2012-11-16 01:37:25 +0000 |
| commit | d281294411049c9ca9fad03441663d96ccb73476 (patch) | |
| tree | f309932499193bc9bb630ead5d6aeb07eeb582a8 /contrib/bmake/make.c | |
| parent | 48176b8f78106dce8ff54e657c3116365c3506d8 (diff) | |
| parent | b9451e8e2e7c949c7a89c32cfed6b2399aef0115 (diff) | |
| download | FreeBSD-src-d281294411049c9ca9fad03441663d96ccb73476.zip FreeBSD-src-d281294411049c9ca9fad03441663d96ccb73476.tar.gz | |
Merge bmake-20121111
Also pay attention to MK_SHARED_TOOLCHAIN.
Approved by: marcel (mentor)
Diffstat (limited to 'contrib/bmake/make.c')
| -rw-r--r-- | contrib/bmake/make.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/bmake/make.c b/contrib/bmake/make.c index 4fa4ff9..7905f8c 100644 --- a/contrib/bmake/make.c +++ b/contrib/bmake/make.c @@ -1,4 +1,4 @@ -/* $NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $ */ +/* $NetBSD: make.c,v 1.88 2012/11/09 18:53:05 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $"; +static char rcsid[] = "$NetBSD: make.c,v 1.88 2012/11/09 18:53:05 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93"; #else -__RCSID("$NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $"); +__RCSID("$NetBSD: make.c,v 1.88 2012/11/09 18:53:05 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -1032,7 +1032,7 @@ MakeBuildChild(void *v_cn, void *toBeMade_next) if (cn->order_pred && Lst_ForEach(cn->order_pred, MakeCheckOrder, 0)) { /* Can't build this (or anything else in this child list) yet */ cn->made = DEFERRED; - return 1; + return 0; /* but keep looking */ } if (DEBUG(MAKE)) @@ -1055,7 +1055,7 @@ MakeBuildChild(void *v_cn, void *toBeMade_next) return cn->type & OP_WAIT && cn->unmade > 0; } -/* When a .ORDER RHS node completes we do this on each LHS */ +/* When a .ORDER LHS node completes we do this on each RHS */ static int MakeBuildParent(void *v_pn, void *toBeMade_next) { |
