MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-05-18 10:53:48 +02:00
Code Issues Releases Wiki Activity

configure: Convey build variant over to boost build; minor cleanup.

Browse source
This commit is contained in:
Jason Volk 2018-01-27 09:33:55 -08:00
parent e95dd21e9e
commit b97b00bf0d
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -738,18 +738,20 @@ AC_HELP_STRING([--with-included-boost[[[=shared]]]], [Use the boost sources from
AC_MSG_RESULT([yes])
AC_MSG_NOTICE([Bootstrapping boost])
AM_COND_IF([MINGW],
AM_COND_IF([DEBUG],
[
BTOOLSET="mingw"
boost_variant="debug"
], [
dnl the CXX may have a space and then arguments so we must chop them
BTOOLSET=`echo $CXX | cut -d' ' -f1`
boost_variant="release"
])
AM_COND_IF([MINGW],
[
BTOOLSET="mingw"
boost_libdir="$PWD/boost/stage/lib"
], [
dnl the CXX may have a space and then arguments so we must chop them
BTOOLSET=`echo $CXX | cut -d' ' -f1`
boost_libdir="$PWD/boost/lib"
])
@ -767,7 +769,7 @@ AC_HELP_STRING([--with-included-boost[[[=shared]]]], [Use the boost sources from
boost_linkage="$withval"
boost_version="boost-${BOOST_VERSION_MIN}.${BOOST_VERSION_MIN_PATCH}"
bash tools/boostrap.sh $BTOOLSET $BOOST_BUILT_LIBS release $withval multi $boost_version
bash tools/boostrap.sh $BTOOLSET $BOOST_BUILT_LIBS $boost_variant $withval multi $boost_version
if [[ $? != 0 ]]; then
AC_MSG_ERROR([Failed to build included boost.])
fi