From e163efb6c70d41c39fde25151d6bafc30a8bae9b Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 Nov 2014 18:18:37 +0000
Subject: [PATCH] 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
---
 Makefile.inc1 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 8cbd58f5afc2..625e8324587c 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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