Merge bootstrap.sh fixes

[SVN r53017]
This commit is contained in:
Vladimir Prus 2009-05-15 05:35:07 +00:00
parent 799e03eb6b
commit 0f9b851463

View file

@ -216,11 +216,11 @@ 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 $pwd
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"
echo "tools/jam/src/$arch/bjam"
cp $BJAM .
cp "$BJAM" .
fi
# TBD: Turn BJAM into an absolute path
@ -249,7 +249,7 @@ if test "x$EPREFIX" = x; then
fi
if test "x$LIBDIR" = x; then
LIBDIR="$EXPREFIX/lib"
LIBDIR="$EPREFIX/lib"
fi
if test "x$INCLUDEDIR" = x; then