diff --git a/install b/install index 782c5e0095612c222ff58a18782755c816013a8c..6f65edd71168b277733ca2c7e2bfd0458c2a56e4 100755 --- a/install +++ b/install @@ -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 diff --git a/script/install_BOOST.sh b/script/install_BOOST.sh index a82dfe7224ba5373fb432b59d9b48cd9801f32d5..0deb5de824058a09eb16661732b084b36848bdde 100755 --- a/script/install_BOOST.sh +++ b/script/install_BOOST.sh @@ -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