organicmaps/boost
13
Fork 0
mirror of https://github.com/boostorg/boost.git synced 2025-04-12 16:12:57 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

"Merge" from develop.

Browse source 
The location of b2 execs changed with release. Need this, or merge of previous equivalent PR, to fix `bootstrap.sh` errors.
This commit is contained in:
Rene Rivera 2019-06-23 23:46:42 -05:00 • committed by GitHub
parent b368c08f09
commit 100102fc3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bootstrap.sh
View file

@ -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