diff options
| author | sjg <sjg@FreeBSD.org> | 2016-05-20 17:35:39 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2016-05-20 17:35:39 +0000 |
| commit | 38da92cdf3d2e4e79de23a2cac45469eb3a03ec1 (patch) | |
| tree | 94aee17178c240d7a9439c9058567346acd5f2a5 /contrib/bmake/compat.c | |
| parent | e1afa8a66332bcb42ea042ec5dfb59de5b33ee08 (diff) | |
| download | FreeBSD-src-38da92cdf3d2e4e79de23a2cac45469eb3a03ec1.zip FreeBSD-src-38da92cdf3d2e4e79de23a2cac45469eb3a03ec1.tar.gz | |
Merge bmake-20160512
Diffstat (limited to 'contrib/bmake/compat.c')
| -rw-r--r-- | contrib/bmake/compat.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/bmake/compat.c b/contrib/bmake/compat.c index 475c59d..87e1261 100644 --- a/contrib/bmake/compat.c +++ b/contrib/bmake/compat.c @@ -1,4 +1,4 @@ -/* $NetBSD: compat.c,v 1.104 2016/02/18 18:29:14 christos Exp $ */ +/* $NetBSD: compat.c,v 1.105 2016/05/12 20:28:34 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: compat.c,v 1.104 2016/02/18 18:29:14 christos Exp $"; +static char rcsid[] = "$NetBSD: compat.c,v 1.105 2016/05/12 20:28:34 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: compat.c,v 1.104 2016/02/18 18:29:14 christos Exp $"); +__RCSID("$NetBSD: compat.c,v 1.105 2016/05/12 20:28:34 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -586,7 +586,8 @@ Compat_Make(void *gnp, void *pgnp) } #ifdef USE_META if (useMeta && !NoExecute(gn)) { - meta_job_finish(NULL); + if (meta_job_finish(NULL) != 0) + gn->made = ERROR; } #endif |
