diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2017-11-02 20:08:00 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2017-11-02 20:08:00 +0000 |
| commit | e22fef7dc1daad9b476ecdba180445fd1af6ca1c (patch) | |
| tree | baf061478276b320d8ff235c4aba7004d65d2a3d /contrib/bmake/main.c | |
| parent | 3947701525811d04d2455b74e9ea6be8afc9514e (diff) | |
| parent | ade1697bee1de85ba84665fc7f1c633c0bfc1faa (diff) | |
Update to bmake-20171028
Ignore empty MAKEOBJDIR[PREFIX]
Reported by: bdrewery
Notes
Notes:
svn path=/head/; revision=325340
Diffstat (limited to 'contrib/bmake/main.c')
| -rw-r--r-- | contrib/bmake/main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/bmake/main.c b/contrib/bmake/main.c index cca44c5b4648..7dd4c504f122 100644 --- a/contrib/bmake/main.c +++ b/contrib/bmake/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos Exp $ */ +/* $NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $"; #else #include <sys/cdefs.h> #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\ #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.272 2017/06/19 19:58:24 christos Exp $"); +__RCSID("$NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -792,7 +792,8 @@ Main_SetVarObjdir(const char *var, const char *suffix) { char *p, *path, *xpath; - if ((path = Var_Value(var, VAR_CMD, &p)) == NULL) + if ((path = Var_Value(var, VAR_CMD, &p)) == NULL || + *path == '\0') return FALSE; /* expand variable substitutions */ |