svn commit: r275424 - stable/10

[Brooks Davis]

Author: brooks
Date: Tue Dec  2 19:58:26 2014
New Revision: 275424
URL: https://svnweb.freebsd.org/changeset/base/275424

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

Modified:
  stable/10/Makefile.inc1
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Tue Dec  2 19:55:46 2014	(r275423)
+++ stable/10/Makefile.inc1	Tue Dec  2 19:58:26 2014	(r275424)
@@ -689,6 +689,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