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

root: merge trunk

Browse source 
[SVN r57638]
This commit is contained in:
Beman Dawes 2009-11-13 14:58:03 +00:00
parent b77b36639f
commit 99d74fb0d7
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
boost-build.jam
View file

@ -10,6 +10,7 @@
# building Boost libraries. Unless explicitly selected using a command-line
# option, the version included with the Boost library distribution is used (as
# opposed to any other Boost Build version installed on the user's sytem).
BOOST_ROOT = $(.boost-build-file:D) ;
BOOST_BUILD = [ MATCH --boost-build=(.*) : $(ARGV) ] ;
BOOST_BUILD ?= tools/build/v2 ;

8
bootstrap.sh
View file

@ -215,7 +215,13 @@ 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" > config.log 2>&1
(cd "$my_dir/tools/jam/src" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1
if [ $? -ne 0 ]; then
echo
echo "Failed to build Boost.Jam"
echo "Consult 'bootstrap.log' for more details"
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"