From 99d74fb0d7db2b9cc85853f3d76bfc129a993404 Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Fri, 13 Nov 2009 14:58:03 +0000
Subject: root: merge trunk

[SVN r57638]
---
 bootstrap.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'bootstrap.sh')

diff --git a/bootstrap.sh b/bootstrap.sh
index c59d8e56fb..70708f44e4 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -215,7 +215,13 @@ rm -f config.log
 if test "x$BJAM" = x; then
   echo -n "Building Boost.Jam with toolset $TOOLSET... "
   pwd=`pwd`
-  cd "$my_dir/tools/jam/src" && ./build.sh "$TOOLSET" > config.log 2>&1
+  (cd "$my_dir/tools/jam/src" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
+  if [ $? -ne 0 ]; then
+      echo
+      echo "Failed to build Boost.Jam" 
+      echo "Consult 'bootstrap.log' for more details"
+      exit 1
+  fi
   cd "$pwd"
   arch=`cd $my_dir/tools/jam/src && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..`
   BJAM="$my_dir/tools/jam/src/$arch/bjam"
-- 
cgit v1.2.1