diff options
| author | Vladimir Prus <ghost@cs.msu.su> | 2011-06-27 11:18:05 +0000 |
|---|---|---|
| committer | Vladimir Prus <ghost@cs.msu.su> | 2011-06-27 11:18:05 +0000 |
| commit | 16e3356dd01ef933b71942c46994594f95917258 (patch) | |
| tree | d1f22dad891329ce2079007d181bf2058cf0b982 /bootstrap.sh | |
| parent | 1ea25b84b3efb609cdc68dff64470e0c6ea60a9d (diff) | |
| download | boost-16e3356dd01ef933b71942c46994594f95917258.tar.gz | |
Use 'b2' spelling of build command.
[SVN r72773]
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index bfdc9c77eb..a9e5b361f0 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -218,15 +218,17 @@ if test "x$BJAM" = x; then (cd "$my_dir/tools/build/v2/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1 if [ $? -ne 0 ]; then echo - echo "Failed to build Boost.Jam" + echo "Failed to build Boost.Build build engine" echo "Consult 'bootstrap.log' for more details" exit 1 fi cd "$pwd" arch=`cd $my_dir/tools/build/v2/engine && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..` - BJAM="$my_dir/tools/build/v2/engine/$arch/bjam" - echo "tools/build/v2/engine/$arch/bjam" + BJAM="$my_dir/tools/build/v2/engine/$arch/b2" + echo "tools/build/v2/engine/$arch/b2" cp "$BJAM" . + cp "$my_dir/tools/build/v2/engine/$arch/bjam" . + fi # TBD: Turn BJAM into an absolute path @@ -378,13 +380,13 @@ cat << EOF Bootstrapping is done. To build, run: - ./bjam + ./b2 To adjust configuration, edit 'project-config.jam'. Further information: - Command line help: - ./bjam --help + ./b2 --help - Getting started guide: http://www.boost.org/more/getting_started/unix-variants.html |