summaryrefslogtreecommitdiff
path: root/usr.bin/make
diff options
context:
space:
mode:
authordholland <dholland@NetBSD.org>2010-07-06 03:56:59 +0000
committerdholland <dholland@NetBSD.org>2010-07-06 03:56:59 +0000
commit6b10e71eb2dae506301193cbbbeac014ff795461 (patch)
treeb628bb074fb26e7b23567a02735c22f2d9b5d9d9 /usr.bin/make
parent476ffd1456eb476235163b4d345bb4e1ed733956 (diff)
Revert 1.80, which somehow manages to produce different (wrong)
behavior with -jN. Unfixes PR 43534. Need a different approach...
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/make.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index d44971dc700..d5052793910 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.80 2010/06/30 00:25:04 dholland Exp $ */
+/* $NetBSD: make.c,v 1.81 2010/07/06 03:56:59 dholland Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: make.c,v 1.80 2010/06/30 00:25:04 dholland Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.81 2010/07/06 03:56:59 dholland 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.80 2010/06/30 00:25:04 dholland Exp $");
+__RCSID("$NetBSD: make.c,v 1.81 2010/07/06 03:56:59 dholland Exp $");
#endif
#endif /* not lint */
#endif
@@ -1331,7 +1331,6 @@ Make_ExpandUse(Lst targs)
(void)Dir_MTime(gn);
Var_Set(TARGET, gn->path ? gn->path : gn->name, gn, 0);
- Var_Set(PREFIX, gn->name, gn, 0);
Lst_ForEach(gn->children, MakeUnmark, gn);
Lst_ForEach(gn->children, MakeHandleUse, gn);