summaryrefslogtreecommitdiffstats
path: root/usr.bin/make
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2009-01-13 06:53:53 +0000
committerobrien <obrien@FreeBSD.org>2009-01-13 06:53:53 +0000
commit9b3fbd47045c09c135ba5f6a9daedade6875ac01 (patch)
treee80f6dfeba19626d7b5d6b24f9f57a4082240001 /usr.bin/make
parent3f0231d9a9ffeacd17638d2313517c00d7be64b9 (diff)
downloadFreeBSD-src-9b3fbd47045c09c135ba5f6a9daedade6875ac01.zip
FreeBSD-src-9b3fbd47045c09c135ba5f6a9daedade6875ac01.tar.gz
Don't enable -Q by default - I've fixed the rescue build issue.
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/job.c3
-rw-r--r--usr.bin/make/main.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 04c7ce5..58f7734 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -2362,8 +2362,7 @@ Job_Init(int maxproc)
makeErrors = 0;
lastNode = NULL;
-
- if ((maxJobs == 1 && fifoFd < 0) || beQuiet || beVerbose == 0) {
+ if ((maxJobs == 1 && fifoFd < 0) || is_posix || beQuiet) {
/*
* If only one job can run at a time, there's no need for a
* banner, no is there?
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index af041bd..0b3b181 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -126,7 +126,7 @@ Boolean is_posix; /* .POSIX target seen */
Boolean mfAutoDeps; /* .MAKEFILEDEPS target seen */
Boolean beSilent; /* -s flag */
Boolean beVerbose; /* -v flag */
-Boolean beQuiet = TRUE; /* -Q flag */
+Boolean beQuiet; /* -Q flag */
Boolean compatMake; /* -B argument */
int debug; /* -d flag */
Boolean ignoreErrors; /* -i flag */
@@ -519,6 +519,7 @@ rearg:
break;
case 'Q':
beQuiet = TRUE;
+ beVerbose = FALSE;
MFLAGS_append("-Q", NULL);
break;
case 'q':
OpenPOWER on IntegriCloud