Module Name: src
Committed By: christos
Date: Mon Aug 1 02:13:22 UTC 2011
Modified Files:
src/usr.bin/make: job.c
Log Message:
Don't attempt to touch special targets; make -t would create .END in every
directory.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/usr.bin/make/job.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/job.c
diff -u src/usr.bin/make/job.c:1.156 src/usr.bin/make/job.c:1.157
--- src/usr.bin/make/job.c:1.156 Thu Mar 31 02:28:42 2011
+++ src/usr.bin/make/job.c Sun Jul 31 22:13:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.156 2011/03/31 06:28:42 sjg Exp $ */
+/* $NetBSD: job.c,v 1.157 2011/08/01 02:13:21 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.156 2011/03/31 06:28:42 sjg Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.157 2011/08/01 02:13:21 christos Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: job.c,v 1.156 2011/03/31 06:28:42 sjg Exp $");
+__RCSID("$NetBSD: job.c,v 1.157 2011/08/01 02:13:21 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -1135,7 +1135,8 @@
int streamID; /* ID of stream opened to do the touch */
struct utimbuf times; /* Times for utime() call */
- if (gn->type & (OP_JOIN|OP_USE|OP_USEBEFORE|OP_EXEC|OP_OPTIONAL|OP_PHONY)) {
+ if (gn->type & (OP_JOIN|OP_USE|OP_USEBEFORE|OP_EXEC|OP_OPTIONAL|
+ OP_SPECIAL|OP_PHONY)) {
/*
* .JOIN, .USE, .ZEROTIME and .OPTIONAL targets are "virtual" targets
* and, as such, shouldn't really be created.
