Skip to content

Commit 10874f3

Browse files
committed
Updated build scripts so that we don't build boost.
1 parent 932bbd0 commit 10874f3

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

build.sh

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ cd build
66
cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
77
-DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS \
88
-DCPP-NETLIB_ENABLE_HTTPS=$ENABLE_HTTPS \
9-
-DBOOST_INCLUDEDIR="${HOME}/${CC}-boost_${BOOST_VERSION}/include" \
10-
-DBOOST_LIBRARYDIR="${HOME}/${CC}-boost_${BOOST_VERSION}/lib" \
119
-DCMAKE_CXX_FLAGS="-std=c++11 ${CMAKE_CXX_FLAGS}" \
1210
..
1311
make -j2

install-boost.sh

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
if [ ! -d "${HOME}/${CC}-boost_${BOOST_VERSION}/include" ]; then
4+
if [ ! -d "${BOOST_ROOT}" ]; then
55
wget -O boost_${BOOST_VERSION}.tar.bz2 http://sourceforge.net/projects/boost/files/boost/${BOOST_VER}/boost_${BOOST_VERSION}.tar.bz2/download
66
tar jxf boost_${BOOST_VERSION}.tar.bz2
7-
cd boost_${BOOST_VERSION}
8-
./bootstrap.sh --with-toolset=$TOOLSET --prefix=${HOME}/${CC}-boost_${BOOST_VERSION}
9-
./b2 --stagedir=. -j4 --layout=tagged variant=debug,release link=shared threading=multi address-model=64 cxxflags='-std=c++11' install >boost-build.log 2>&1
10-
cd ..
11-
rm -rf boost_${BOOST_VERSION}
12-
rm -rf boost_${BOOST_VERSION}.tar.bz2
137
fi

0 commit comments

Comments
 (0)