MFC bmake changes to stable/10 (r255285,r255916,r258113,r258114,r261212,r266760,r268437)

Discussed with: sjg

r255285:

  If MAKE_JOB_ERROR_TOKEN is set to false, do not put an error token ("E")
  into the job queue.
  This avoids closing down an entire build on failure of one branch.
  Probably has no use outside the context of universe/tinderbox.

  Reviewed by:	obrien

r255916:

  Fix Fx syntax.

  PR: 182269
  Approved by: re@

r258113:

  Avoid SEGV when passed NULL for list

r258114:

  Don't SEGV when Hash_Table is uninitialized

r261212:

  Merge bmake-20140101 from vendor

r266760:

  Portmgr no longer need the UL hack.

  Reviewed by: obrien

r268437:

  Update to bmake-20140620
  Main change is detection of malformed variable references.

  Reviewed by:	obrien

1 files changed, 6 insertions, 4 deletions

diff --git a/contrib/bmake/os.sh b/contrib/bmake/os.sh
index 9e45f37..b714eb7 100755
--- a/contrib/bmake/os.sh
+++ b/contrib/bmake/os.sh
@@ -17,7 +17,7 @@
 #	Simon J. Gerraty <sjg@crufty.net>
 
 # RCSid:
-#	$Id: os.sh,v 1.44 2010/06/29 15:37:21 sjg Exp $
+#	$Id: os.sh,v 1.46 2014/05/19 16:38:09 sjg Exp $
 #
 #	@(#) Copyright (c) 1994 Simon J. Gerraty
 #
@@ -128,11 +128,13 @@ SunOS)
 	K=-k
 	MAILER=/usr/bin/Mail
 	LOCAL_FS=local
-	case "$-" in
-	*i*) ;;
+	: $-,$ENV
+	case "$-,$ENV" in
+	*i*,*) ;;
+	*,|*ENVFILE*) ;;
 	*) ENV=;;
 	esac
-	# NetBSD at least has good backward compatability
+	# NetBSD at least has good backward compatibility
 	# so NetBSD/i386 is good enough
 	case $OS in
 	NetBSD) SHARE_ARCH=$OS/${MACHINE_ARCH:-$MACHINE};;