diff options
| author | ngie <ngie@FreeBSD.org> | 2014-12-27 16:43:22 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2014-12-27 16:43:22 +0000 |
| commit | 8add61763b21b8a771358ffb7487539302c74b89 (patch) | |
| tree | 6e0c6cbe41773548a3cf1cc3e78f0f9603cfc512 /contrib/bmake/util.c | |
| parent | 47ae0568410e2e98be8543ec7afddbbabda95453 (diff) | |
| download | FreeBSD-src-8add61763b21b8a771358ffb7487539302c74b89.zip FreeBSD-src-8add61763b21b8a771358ffb7487539302c74b89.tar.gz | |
MFC bmake changes to stable/10 (r255285,r255916,r258113,r258114,r261212,r266760,r268437)
Discussed with: sjg
r255285:
If MAKE_JOB_ERROR_TOKEN is set to false, do not put an error token ("E")
into the job queue.
This avoids closing down an entire build on failure of one branch.
Probably has no use outside the context of universe/tinderbox.
Reviewed by: obrien
r255916:
Fix Fx syntax.
PR: 182269
Approved by: re@
r258113:
Avoid SEGV when passed NULL for list
r258114:
Don't SEGV when Hash_Table is uninitialized
r261212:
Merge bmake-20140101 from vendor
r266760:
Portmgr no longer need the UL hack.
Reviewed by: obrien
r268437:
Update to bmake-20140620
Main change is detection of malformed variable references.
Reviewed by: obrien
Diffstat (limited to 'contrib/bmake/util.c')
| -rw-r--r-- | contrib/bmake/util.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/contrib/bmake/util.c b/contrib/bmake/util.c index a63fd33..c79f645 100644 --- a/contrib/bmake/util.c +++ b/contrib/bmake/util.c @@ -1,18 +1,21 @@ -/* $NetBSD: util.c,v 1.53 2012/06/04 22:45:05 sjg Exp $ */ +/* $NetBSD: util.c,v 1.54 2013/11/26 13:44:41 joerg Exp $ */ /* * Missing stuff from OS's * - * $Id: util.c,v 1.32 2012/06/06 20:08:44 sjg Exp $ + * $Id: util.c,v 1.33 2014/01/02 02:29:49 sjg Exp $ */ +#if defined(__MINT__) || defined(__linux__) +#include <signal.h> +#endif #include "make.h" #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: util.c,v 1.53 2012/06/04 22:45:05 sjg Exp $"; +static char rcsid[] = "$NetBSD: util.c,v 1.54 2013/11/26 13:44:41 joerg Exp $"; #else #ifndef lint -__RCSID("$NetBSD: util.c,v 1.53 2012/06/04 22:45:05 sjg Exp $"); +__RCSID("$NetBSD: util.c,v 1.54 2013/11/26 13:44:41 joerg Exp $"); #endif #endif |
