Skip to content
Snippets Groups Projects
Commit 6d815052 authored by Pietro Incardona's avatar Pietro Incardona
Browse files

Fixing install boost

parent 1f81df07
No related branches found
No related tags found
No related merge requests found
Pipeline #3779 passed
......@@ -349,12 +349,16 @@ else
if [ x"$CXX" == x"icpc" ]; then
./script/install_BOOST.sh $i_dir $ncore intel-linux
elif [ x"$CXX" == x"clang++" ]; then
./script/install_BOOST.sh $i_dir $ncore darwin
./script/install_BOOST.sh $i_dir $ncore clang
else
if [ x"$CXX" == x"gcc" ]; then
./script/install_BOOST.sh $i_dir $ncore gcc
if [ x"$CXX" == x"g++" ]; then
if [ x"$is_apple_llvm" == x"1" ]; then
./script/install_BOOST.sh $i_dir $ncore clang
else
./script/install_BOOST.sh $i_dir $ncore gcc
fi
else
./script/install_BOOST.sh $i_dir $ncore gcc $(which $CXX) $dgc_major $dgc_middle
./script/install_BOOST.sh $i_dir $ncore gcc $(which $CXX)
fi
fi
BOOST_installed=1
......
......@@ -26,18 +26,21 @@ if [ x"$4" != x"" ]; then
fi
./bootstrap.sh --with-toolset=$3
mkdir $1/BOOST
# Several flavours
arch=$(uname -m)
if [ x"$platform" == x"osx" ]; then
if [ x"$arch" == x"arm64" ]; then
./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=arm abi=aapcs binary-format=mach-o
if [ x"$3" == x"" ]; then
./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=arm abi=aapcs binary-format=mach-o toolset=clang
else
./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=arm abi=aapcs binary-format=mach-o toolset=$3
fi
else
./b2 -j $2 install --prefix=$1/BOOST
fi
else
./b2 -j $2 install --prefix=$1/BOOST
fi
rm -rf boost_1_75_0
if [ -f $HOME/user-config.jam_bck ]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment