svn commit: r187132 - head/usr.bin/make

David E. O'Brien obrien at FreeBSD.org
Mon Jan 12 22:53:55 PST 2009


Author: obrien
Date: Tue Jan 13 06:53:53 2009
New Revision: 187132
URL: http://svn.freebsd.org/changeset/base/187132

Log:
  Don't enable -Q by default - I've fixed the rescue build issue.

Modified:
  head/usr.bin/make/job.c
  head/usr.bin/make/main.c

Modified: head/usr.bin/make/job.c
==============================================================================
--- head/usr.bin/make/job.c	Tue Jan 13 06:52:51 2009	(r187131)
+++ head/usr.bin/make/job.c	Tue Jan 13 06:53:53 2009	(r187132)
@@ -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?

Modified: head/usr.bin/make/main.c
==============================================================================
--- head/usr.bin/make/main.c	Tue Jan 13 06:52:51 2009	(r187131)
+++ head/usr.bin/make/main.c	Tue Jan 13 06:53:53 2009	(r187132)
@@ -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':


More information about the svn-src-all mailing list