diff options
| author | Vladimir Prus <ghost@cs.msu.su> | 2010-09-04 11:02:21 +0000 |
|---|---|---|
| committer | Vladimir Prus <ghost@cs.msu.su> | 2010-09-04 11:02:21 +0000 |
| commit | d3833607a2a3287b36e6d520acfd0f0ce453cce4 (patch) | |
| tree | e486ee94e701fd7a9e795a2dc0e7b2ca1cb3bae6 /bootstrap.sh | |
| parent | b67ca385225b5fd9e38cf248d5e82c42ca5d5388 (diff) | |
| download | boost-d3833607a2a3287b36e6d520acfd0f0ce453cce4.tar.gz | |
Merge r64010, wherein jam has been moved.
[SVN r65233]
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 70708f44e4..fd4fdd6fad 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -185,7 +185,7 @@ my_dir="." # Determine the toolset, if not already decided if test "x$TOOLSET" = x; then - guessed_toolset=`$my_dir/tools/jam/src/build.sh --guess-toolset` + guessed_toolset=`$my_dir/tools/build/v2/engine/src/build.sh --guess-toolset` case $guessed_toolset in acc | darwin | gcc | como | mipspro | pathscale | pgi | qcc | vacpp ) TOOLSET=$guessed_toolset @@ -215,7 +215,7 @@ 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") > bootstrap.log 2>&1 + (cd "$my_dir/tools/build/v2/engine/src" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1 if [ $? -ne 0 ]; then echo echo "Failed to build Boost.Jam" @@ -223,9 +223,9 @@ if test "x$BJAM" = x; then 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" - echo "tools/jam/src/$arch/bjam" + arch=`cd $my_dir/tools/build/v2/engine/src && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..` + BJAM="$my_dir/tools/build/v2/engine/src/$arch/bjam" + echo "tools/build/v2/engine/src/$arch/bjam" cp "$BJAM" . fi |