From owner-svn-src-head@FreeBSD.ORG  Fri Nov 21 18:18:38 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3A5C514F;
 Fri, 21 Nov 2014 18:18:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2709A6C1;
 Fri, 21 Nov 2014 18:18:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALIIcKP096705;
 Fri, 21 Nov 2014 18:18:38 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALIIc5m096704;
 Fri, 21 Nov 2014 18:18:38 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201411211818.sALIIc5m096704@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: brooks set sender to
 brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Nov 2014 18:18:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274806 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Fri, 21 Nov 2014 18:18:38 -0000

Author: brooks
Date: Fri Nov 21 18:18:37 2014
New Revision: 274806
URL: https://svnweb.freebsd.org/changeset/base/274806

Log:
  Add a guard against attempting to invoke the buildenv target with -j# as
  that silently exits rather than doing something useful.
  
  MFC after:	1 week
  Sponsored by:	DARPA, AFRL

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Nov 21 18:05:02 2014	(r274805)
+++ head/Makefile.inc1	Fri Nov 21 18:18:37 2014	(r274806)
@@ -691,6 +691,11 @@ buildworld_epilogue:
 buildenvvars:
 	@echo ${WMAKEENV:Q}
 
+.if ${.TARGETS:Mbuildenv}
+.if ${.MAKEFLAGS:M-j}
+.error The buildenv target is incompatible with -j
+.endif
+.endif
 buildenv:
 	@echo Entering world for ${TARGET_ARCH}:${TARGET}
 	@cd ${.CURDIR} && env ${WMAKEENV} ${BUILDENV_SHELL} || true