Module Name: src
Committed By: dholland
Date: Tue Jul 6 03:56:59 UTC 2010
Modified Files:
src/usr.bin/make: make.c
Log Message:
Revert 1.80, which somehow manages to produce different (wrong)
behavior with -jN. Unfixes PR 43534. Need a different approach...
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/usr.bin/make/make.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/make.c
diff -u src/usr.bin/make/make.c:1.80 src/usr.bin/make/make.c:1.81
--- src/usr.bin/make/make.c:1.80 Wed Jun 30 00:25:04 2010
+++ src/usr.bin/make/make.c Tue Jul 6 03:56:59 2010
@@ -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 @@
(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);
