From owner-svn-src-head@FreeBSD.ORG  Sun Oct 18 11:26:09 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C78B510656CD;
	Sun, 18 Oct 2009 11:26:09 +0000 (UTC)
	(envelope-from fjoe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B5C3F8FC08;
	Sun, 18 Oct 2009 11:26:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9IBQ9j3067573;
	Sun, 18 Oct 2009 11:26:09 GMT (envelope-from fjoe@svn.freebsd.org)
Received: (from fjoe@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9IBQ9kJ067571;
	Sun, 18 Oct 2009 11:26:09 GMT (envelope-from fjoe@svn.freebsd.org)
Message-Id: <200910181126.n9IBQ9kJ067571@svn.freebsd.org>
From: Max Khon <fjoe@FreeBSD.org>
Date: Sun, 18 Oct 2009 11:26:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198197 - head/usr.bin/make
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Oct 2009 11:26:09 -0000

Author: fjoe
Date: Sun Oct 18 11:26:09 2009
New Revision: 198197
URL: http://svn.freebsd.org/changeset/base/198197

Log:
  Exit with non-zero error code in case of errors
  when make is run with -k and not parallel (compat) make is run.

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

Modified: head/usr.bin/make/job.c
==============================================================================
--- head/usr.bin/make/job.c	Sun Oct 18 11:23:56 2009	(r198196)
+++ head/usr.bin/make/job.c	Sun Oct 18 11:26:09 2009	(r198197)
@@ -3380,6 +3380,8 @@ Compat_Run(Lst *targs)
 			printf("`%s' not remade because of errors.\n",
 			    gn->name);
 			makeErrors++;
+		} else if (gn->made == ERROR) {
+			makeErrors++;
 		}
 	}