Import bmake-20100808:

- boot-strap (TOOL_DIFF): set this to ensure tests use the same version
  of diff that configure tested
- in jobs mode, when we discover we cannot make something, call
  PrintOnError before exit.
- formatting fixes for ignored errors
- ensure jobs are cleaned up regardless of where wait() was called.
- os.sh (MACHINE_ARCH): watch out for drivel from uname -p
- call PrintOnError from JobFinish when we detect an error we are not
  ignoring.
- use bmake_signal() which is a wrapper around sigaction() in place of
  signal()
- add .export-env to allow exporting variables to environment without
  tracking (so no re-export when the internal value is changed).
- fix for .info et al being greedy.
- back to using realpath on argv[0] but only if contains '/' and does not
  start with '/'.

1 files changed, 4 insertions, 2 deletions

diff --git a/devel/bmake/files/boot-strap b/devel/bmake/files/boot-strap
index e4117008dd0..44d497c9883 100755
--- a/devel/bmake/files/boot-strap
+++ b/devel/bmake/files/boot-strap
@@ -53,7 +53,7 @@
 #	Simon J. Gerraty <sjg@crufty.net>
 
 # RCSid:
-#	$Id: boot-strap,v 1.1.1.8 2010/05/13 18:37:40 joerg Exp $
+#	$Id: boot-strap,v 1.1.1.9 2010/09/07 14:11:15 joerg Exp $
 #
 #	@(#) Copyright (c) 2001 Simon J. Gerraty
 #
@@ -293,7 +293,9 @@ if [ -s "${mksrc:-/dev/null}/install-mk" ]; then
         *) MAKESYSPATH=".../mk:${MAKESYSPATH}";;
         esac
 fi
-export MAKESYSPATH
+# make sure test below uses the same diff that configure did
+TOOL_DIFF=`type diff | sed 's,^[^/][^/]*,,;q'`
+export MAKESYSPATH TOOL_DIFF
 if [ "$mksrc" ]; then
         $objdir/bmake test || exit 1
 else