diff options
| author | Rene Rivera <grafikrobot@gmail.com> | 2019-06-23 23:46:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 23:46:42 -0500 |
| commit | 100102fc3c2e0521ba01a708e2c306905b478ecd (patch) | |
| tree | 0ec0d3f95f60e52fe246f0f9ca34355083f88d10 /bootstrap.sh | |
| parent | b368c08f09d08004644fe049ca6bacb61ce2fe59 (diff) | |
| download | boost-100102fc3c2e0521ba01a708e2c306905b478ecd.tar.gz | |
"Merge" from develop.
The location of b2 execs changed with release. Need this, or merge of previous equivalent PR, to fix `bootstrap.sh` errors.
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 01f71479e3..4a39f6780e 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,4 +1,5 @@ #!/bin/sh +# Copyright 2019 Rene Rivera # Copyright (C) 2005, 2006 Douglas Gregor. # Copyright (C) 2006 The Trustees of Indiana University # @@ -194,7 +195,7 @@ my_dir=$(dirname "$0") if test "x$TOOLSET" = x; then guessed_toolset=`$my_dir/tools/build/src/engine/build.sh --guess-toolset` case $guessed_toolset in - acc | darwin | gcc | como | mipspro | pathscale | pgi | qcc | vacpp ) + acc | clang | gcc | como | mipspro | pathscale | pgi | qcc | vacpp ) TOOLSET=$guessed_toolset ;; @@ -230,11 +231,9 @@ if test "x$BJAM" = x; then exit 1 fi cd "$pwd" - arch=`cd $my_dir/tools/build/src/engine && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..` - BJAM="$my_dir/tools/build/src/engine/$arch/b2" - echo "tools/build/src/engine/$arch/b2" + BJAM="$my_dir/tools/build/src/engine/b2" + echo "tools/build/src/engine/b2" cp "$BJAM" . - cp "$my_dir/tools/build/src/engine/$arch/bjam" . fi |