diff options
| -rw-r--r-- | boost-build.jam | 1 | ||||
| -rwxr-xr-x | bootstrap.sh | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/boost-build.jam b/boost-build.jam index 1ba9dd2de3..8b8775433a 100644 --- a/boost-build.jam +++ b/boost-build.jam @@ -10,6 +10,7 @@ # building Boost libraries. Unless explicitly selected using a command-line # option, the version included with the Boost library distribution is used (as # opposed to any other Boost Build version installed on the user's sytem). + BOOST_ROOT = $(.boost-build-file:D) ; BOOST_BUILD = [ MATCH --boost-build=(.*) : $(ARGV) ] ; BOOST_BUILD ?= tools/build/v2 ; 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" |