Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure `-n' is actually disabled for targets with the .MAKE attribute.

This commit is contained in:
mycroft 1997-05-06 23:51:29 +00:00
parent a6437aa465
commit 755bc65362
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/make/compat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: compat.c,v 1.18 1997/03/28 22:31:22 christos Exp $ */
/* $NetBSD: compat.c,v 1.19 1997/05/06 23:51:29 mycroft Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94";
#else
static char rcsid[] = "$NetBSD: compat.c,v 1.18 1997/03/28 22:31:22 christos Exp $";
static char rcsid[] = "$NetBSD: compat.c,v 1.19 1997/05/06 23:51:29 mycroft Exp $";
#endif
#endif /* not lint */
@ -113,7 +113,7 @@ CompatInterrupt (signo)
char *file = Var_Value (TARGET, curTarg, &p1);
if (!noExecute && eunlink(file) != -1) {
printf ("*** %s removed\n", file);
Error("*** %s removed\n", file);
}
if (p1)
free(p1);
@ -231,7 +231,7 @@ CompatRunCommand (cmdp, gnp)
* Print the command before echoing if we're not supposed to be quiet for
* this one. We also print the command if -n given.
*/
if (!silent || noExecute) {
if (!silent || (noExecute && !(gn->type & OP_MAKE))) {
printf ("%s\n", cmd);
fflush(stdout);
}
@ -240,7 +240,7 @@ CompatRunCommand (cmdp, gnp)
* If we're not supposed to execute any commands, this is as far as
* we go...
*/
if (noExecute) {
if (noExecute && !(gn->type & OP_MAKE)) {
return (0);
}
@ -515,7 +515,8 @@ CompatMake (gnp, pgnp)
* ok.
* -- ardeb 1/12/88
*/
if (noExecute || Dir_MTime(gn) == 0) {
if ((noExecute && !(gn->type & OP_MAKE)) ||
(gn->type & OP_SAVE_CMDS) || Dir_MTime(gn) == 0) {
gn->mtime = now;
}
if (gn->cmtime > gn->mtime)

10
usr.bin/make/job.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: job.c,v 1.17 1997/05/06 20:57:47 mycroft Exp $ */
/* $NetBSD: job.c,v 1.18 1997/05/06 23:51:30 mycroft Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
static char rcsid[] = "$NetBSD: job.c,v 1.17 1997/05/06 20:57:47 mycroft Exp $";
static char rcsid[] = "$NetBSD: job.c,v 1.18 1997/05/06 23:51:30 mycroft Exp $";
#endif
#endif /* not lint */
@ -527,7 +527,7 @@ JobPrintCommand(cmdp, jobp)
char *cmd = (char *) cmdp;
Job *job = (Job *) jobp;
noSpecials = (noExecute && !(job->node->type & OP_MAKE));
noSpecials = noExecute && !(job->node->type & OP_MAKE);
if (strcmp(cmd, "...") == 0) {
job->node->type |= OP_SAVE_CMDS;
@ -1028,12 +1028,12 @@ Job_Touch(gn, silent)
return;
}
if (!silent) {
if (!silent || (noExecute && !(gn->type & OP_MAKE))) {
(void) fprintf(stdout, "touch %s\n", gn->name);
(void) fflush(stdout);
}
if (noExecute) {
if (noExecute && !(gn->type & OP_MAKE)) {
return;
}

7
usr.bin/make/make.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: make.c,v 1.15 1997/05/02 14:24:27 christos Exp $ */
/* $NetBSD: make.c,v 1.16 1997/05/06 23:51:31 mycroft Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93";
#else
static char rcsid[] = "$NetBSD: make.c,v 1.15 1997/05/02 14:24:27 christos Exp $";
static char rcsid[] = "$NetBSD: make.c,v 1.16 1997/05/06 23:51:31 mycroft Exp $";
#endif
#endif /* not lint */
@ -529,7 +529,8 @@ Make_Update (cgn)
* the target is made now. Otherwise archives with ... rules
* don't work!
*/
if (noExecute || (cgn->type & OP_SAVE_CMDS) || Dir_MTime(cgn) == 0) {
if ((noExecute && !(cgn->type & OP_MAKE)) ||
(cgn->type & OP_SAVE_CMDS) || Dir_MTime(cgn) == 0) {
cgn->mtime = now;
}
if (DEBUG(MAKE)) {