Module Name: src
Committed By: sjg
Date: Sat Oct 28 21:54:54 UTC 2017
Modified Files:
src/usr.bin/make: main.c
Log Message:
Ignore empty MAKEOBJDIR
Otherwise we end up with .OBJDIR = ${.CURDIR}/
which is quivalent, but fails the typial
.if ${.OBJDIR} == ${.CURDIR}
To generate a diff of this commit:
cvs rdiff -u -r1.272 -r1.273 src/usr.bin/make/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.272 src/usr.bin/make/main.c:1.273
--- src/usr.bin/make/main.c:1.272 Mon Jun 19 19:58:24 2017
+++ src/usr.bin/make/main.c Sat Oct 28 21:54:54 2017
@@ -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, 19
#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
@@ -761,7 +761,8 @@ Main_SetVarObjdir(const char *var, const
{
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 */
